Skip to content

Commit 8a6740b

Browse files
authored
Merge pull request #13 from gizmoguy/no-bash
Further reduce size of python3 docker image
2 parents b7a8099 + added5f commit 8a6740b

File tree

4 files changed

+38
-6
lines changed

4 files changed

+38
-6
lines changed

.github/workflows/release.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ jobs:
99
docker-image:
1010
name: "Build docker image"
1111
runs-on: ubuntu-latest
12+
environment:
13+
name: "release"
1214
steps:
1315
- name: Checkout
1416
uses: actions/checkout@v3

.github/workflows/test.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Test workflow
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
docker-image:
7+
name: "Build docker image"
8+
runs-on: ubuntu-latest
9+
steps:
10+
- name: Checkout
11+
uses: actions/checkout@v3
12+
- name: Set up qemu
13+
uses: docker/setup-qemu-action@v1
14+
with:
15+
platforms: all
16+
- name: Set up docker buildx
17+
id: buildx
18+
uses: docker/setup-buildx-action@v1
19+
with:
20+
version: latest
21+
- name: Run buildx
22+
run: |
23+
docker buildx build \
24+
--platform linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x \
25+
--file Dockerfile \
26+
.

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
FROM python:3.9-alpine3.15
44

5-
RUN apk add --no-cache bash su-exec && \
5+
RUN apk add --no-cache su-exec && \
66
if [ ! -e /usr/bin/pip ]; then ln -s /usr/bin/pip3 /usr/bin/pip; fi && \
77
if [ ! -e /usr/bin/python ]; then ln -s /usr/bin/python3 /usr/bin/python; fi
88

entrypoint.sh

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/bin/ash
22

33
# Add local user
44
# Either use the LOCAL_USER_ID if passed in at runtime or
@@ -8,8 +8,12 @@ USER_ID=${LOCAL_USER_ID:-0}
88
GROUP_ID=${LOCAL_GROUP_ID:-0}
99

1010
echo "Starting with UID=$USER_ID GID=$GROUP_ID"
11-
export HOME="/home/faucet"
12-
addgroup -g "${GROUP_ID}" faucet >/dev/null 2>&1 || true
13-
adduser -u "${USER_ID}" -G faucet -g "" -h "${HOME}" -D faucet >/dev/null 2>&1 || true
1411

15-
exec /sbin/su-exec faucet "$@"
12+
if [ "${USER_ID}" -ne 0 ] && [ "${GROUP_ID}" -ne 0 ]; then
13+
export HOME="/home/faucet"
14+
addgroup -g "${GROUP_ID}" faucet >/dev/null 2>&1 || true
15+
adduser -u "${USER_ID}" -G faucet -g "" -h "${HOME}" -D faucet >/dev/null 2>&1 || true
16+
exec /sbin/su-exec faucet "$@"
17+
else
18+
exec "$@"
19+
fi

0 commit comments

Comments
 (0)