Skip to content

Commit 94aa88b

Browse files
QuintenQVD0QuintenQVD0
authored
Merge branch 'master' into tini
2 parents baf2724 + 02aad51 commit 94aa88b

File tree

27 files changed

+335
-99
lines changed

27 files changed

+335
-99
lines changed

‎.github/workflows/bun.yml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: build bun
2+
on:
3+
workflow_dispatch:
4+
schedule:
5+
- cron: "0 0 * * 1"
6+
push:
7+
branches:
8+
- master
9+
paths:
10+
- bun/**
11+
jobs:
12+
push:
13+
name: "yolks:bun_${{ matrix.tag }}"
14+
runs-on: ubuntu-latest
15+
strategy:
16+
fail-fast: false
17+
matrix:
18+
tag:
19+
- latest
20+
- canary
21+
steps:
22+
- uses: actions/checkout@v3
23+
- uses: docker/setup-qemu-action@v2
24+
- uses: docker/setup-buildx-action@v2
25+
with:
26+
buildkitd-flags: --debug
27+
- uses: docker/login-action@v2
28+
with:
29+
registry: ghcr.io
30+
username: ${{ github.repository_owner }}
31+
password: ${{ secrets.REGISTRY_TOKEN }}
32+
- uses: docker/build-push-action@v4
33+
with:
34+
context: ./bun
35+
file: ./bun/${{ matrix.tag }}/Dockerfile
36+
platforms: linux/amd64,linux/arm64
37+
push: true
38+
tags: |
39+
ghcr.io/parkervcp/yolks:bun_${{ matrix.tag }}

‎.github/workflows/installers.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ jobs:
2121
- ubuntu
2222
steps:
2323
- uses: actions/checkout@v3
24+
- uses: docker/setup-qemu-action@v2
2425
- uses: docker/setup-buildx-action@v2
2526
with:
2627
buildkitd-flags: --debug
@@ -33,7 +34,7 @@ jobs:
3334
with:
3435
context: ./installers
3536
file: ./installers/${{ matrix.tag }}/Dockerfile
36-
platforms: linux/amd64
37+
platforms: linux/amd64,linux/arm64
3738
push: true
3839
tags: |
3940
ghcr.io/parkervcp/installers:${{ matrix.tag }}

‎.github/workflows/wine.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ jobs:
1717
matrix:
1818
tag:
1919
- latest
20+
- devel
2021
- staging
2122
steps:
2223
- uses: actions/checkout@v3

‎README.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,13 @@ is tagged correctly.
5151
* [`Box64`](/box64)
5252
* `ghcr.io/parkervcp/yolks:box64`
5353

54+
### [Bun](/bun)
55+
56+
* [`Bun Canary`](/bun/canary)
57+
* `ghcr.io/parkervcp/yolks:bun_canary`
58+
* [`Bun Latest`](/bun/latest)
59+
* `ghcr.io/parkervcp/yolks:bun_latest`
60+
5461
### [Cassandra](/cassandra)
5562

5663
* [`cassandra_java8_python27`](/cassandra/cassandra_java8_python2)
@@ -176,6 +183,7 @@ is tagged correctly.
176183
* [`node20`](/nodejs/20)
177184
* `ghcr.io/parkervcp/yolks:nodejs_20`
178185

186+
179187
### [PostgreSQL](/postgres)
180188

181189
* [`Postgres 9`](/postgres/9)
@@ -244,6 +252,7 @@ is tagged correctly.
244252

245253
* [`Wine`](/wine)
246254
* `ghcr.io/parkervcp/yolks:wine_latest`
255+
* `ghcr.io/parkervcp/yolks:wine_devel`
247256
* `ghcr.io/parkervcp/yolks:wine_staging`
248257

249258
### [Installation Images](/installers)

‎bun/canary/Dockerfile‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
FROM --platform=$TARGETOS/$TARGETARCH oven/bun:canary
2+
3+
LABEL author="MrAtox" maintainer="mratox@protonmail.com"
4+
5+
RUN apt update \
6+
&& apt -y install ffmpeg iproute2 git sqlite3 libsqlite3-dev python3 python3-dev ca-certificates dnsutils tzdata zip tar curl build-essential libtool \
7+
&& useradd -m -d /home/container container
8+
9+
RUN bun upgrade
10+
11+
USER container
12+
ENV USER=container HOME=/home/container
13+
WORKDIR /home/container
14+
15+
ENTRYPOINT []
16+
COPY ./../entrypoint.sh /entrypoint.sh
17+
CMD [ "/bin/bash", "/entrypoint.sh" ]

‎bun/entrypoint.sh‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#!/bin/bash
2+
cd /home/container
3+
4+
# Make internal Docker IP address available to processes.
5+
INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
6+
export INTERNAL_IP
7+
8+
# Print Bun Version
9+
bun -v
10+
11+
# Replace Startup Variables
12+
MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')
13+
echo -e ":/home/container$ ${MODIFIED_STARTUP}"
14+
15+
# Run the Server
16+
eval ${MODIFIED_STARTUP}

‎bun/latest/Dockerfile‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
FROM --platform=$TARGETOS/$TARGETARCH oven/bun:latest
2+
3+
LABEL author="MrAtox" maintainer="mratox@protonmail.com"
4+
5+
RUN apt update \
6+
&& apt -y install ffmpeg iproute2 git sqlite3 libsqlite3-dev python3 python3-dev ca-certificates dnsutils tzdata zip tar curl build-essential libtool \
7+
&& useradd -m -d /home/container container
8+
9+
RUN bun upgrade
10+
11+
USER container
12+
ENV USER=container HOME=/home/container
13+
WORKDIR /home/container
14+
15+
ENTRYPOINT []
16+
COPY ./../entrypoint.sh /entrypoint.sh
17+
CMD [ "/bin/bash", "/entrypoint.sh" ]

‎installers/debian/Dockerfile‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,12 @@ LABEL org.opencontainers.image.licenses=MIT
2929

3030
ENV DEBIAN_FRONTEND=noninteractive
3131

32-
RUN dpkg --add-architecture i386 \
33-
&& apt update \
34-
&& apt upgrade -y \
35-
&& apt -y --no-install-recommends install ca-certificates curl lib32gcc-s1 libsdl2-2.0-0:i386 git unzip zip tar jq wget
32+
RUN apt update && apt upgrade -y \
33+
&& apt -y --no-install-recommends install ca-certificates curl git unzip zip tar jq wget
34+
35+
# Only install the needed steamcmd packages on the AMD64 build
36+
RUN if [ "$(uname -m)" = "x86_64" ]; then \
37+
dpkg --add-architecture i386 && \
38+
apt update && \
39+
apt -y install lib32gcc-s1 libsdl2-2.0-0:i386; \
40+
fi

‎java/11/Dockerfile‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,23 @@ LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolk
66
LABEL org.opencontainers.image.licenses=MIT
77

88
RUN apt update -y \
9-
&& apt install -y curl lsof ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 tini \
10-
&& useradd -d /home/container -m container
9+
&& apt install -y \
10+
curl \
11+
lsof \
12+
ca-certificates \
13+
openssl \
14+
git \
15+
tar \
16+
sqlite3 \
17+
fontconfig \
18+
tzdata \
19+
iproute2 \
20+
libfreetype6 \
21+
tini
1122

23+
24+
## Setup user and working directory
25+
RUN useradd -m -d /home/container -s /bin/bash container
1226
USER container
1327
ENV USER=container HOME=/home/container
1428
WORKDIR /home/container

‎java/11j9/Dockerfile‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,29 @@ FROM --platform=$TARGETOS/$TARGETARCH ibm-semeru-runtimes:open-11-jdk
33
LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
44

55
RUN apt update -y \
6-
&& apt install -y curl lsof ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 tini \
7-
&& useradd -d /home/container -m container
6+
&& apt install -y \
7+
curl \
8+
lsof \
9+
ca-certificates \
10+
openssl \
11+
git \
12+
tar \
13+
sqlite3 \
14+
fontconfig \
15+
tzdata \
16+
iproute2 \
17+
libfreetype6 \
18+
tini
819

20+
## Setup user and working directory
21+
RUN useradd -m -d /home/container -s /bin/bash container
922
USER container
1023
ENV USER=container HOME=/home/container
11-
1224
WORKDIR /home/container
1325

1426
STOPSIGNAL SIGINT
1527

1628
COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
1729
RUN chmod +x /entrypoint.sh
1830
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
19-
CMD ["/entrypoint.sh"]
31+
CMD ["/entrypoint.sh"]

0 commit comments

Comments
 (0)