Skip to content

Commit f35676f

Browse files
authored
Switch from Alpine -> Debian-slim (outline#7040)
* Switch from Alpine -> Debian-slim * Drop arm/v6
1 parent bf130f9 commit f35676f

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

.circleci/config.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ jobs:
126126
docker buildx install
127127
docker context create docker-multiarch
128128
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
129-
docker buildx create --name docker-multiarch --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x docker-multiarch
129+
docker buildx create --name docker-multiarch --platform linux/amd64,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x docker-multiarch
130130
docker buildx inspect --builder docker-multiarch --bootstrap
131131
docker buildx use docker-multiarch
132132
- run:
@@ -142,9 +142,9 @@ jobs:
142142
name: Build and push Docker image
143143
command: |
144144
if [[ "$CIRCLE_TAG" == *"-"* ]]; then
145-
docker buildx build -t $IMAGE_NAME:${CIRCLE_TAG/v/''} --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x --push .
145+
docker buildx build -t $IMAGE_NAME:${CIRCLE_TAG/v/''} --platform linux/amd64,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x --push .
146146
else
147-
docker buildx build -t $IMAGE_NAME:latest -t $IMAGE_NAME:${CIRCLE_TAG/v/''} --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x --push .
147+
docker buildx build -t $IMAGE_NAME:latest -t $IMAGE_NAME:${CIRCLE_TAG/v/''} --platform linux/amd64,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x --push .
148148
fi
149149
150150
workflows:

Dockerfile

+4-5
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ ARG APP_PATH
55
WORKDIR $APP_PATH
66

77
# ---
8-
FROM node:20-alpine AS runner
9-
10-
RUN apk update && apk add --no-cache curl && apk add --no-cache ca-certificates
8+
FROM node:20-slim AS runner
119

1210
LABEL org.opencontainers.image.source="https://github.com/outline/outline"
1311

@@ -22,8 +20,9 @@ COPY --from=base $APP_PATH/.sequelizerc ./.sequelizerc
2220
COPY --from=base $APP_PATH/node_modules ./node_modules
2321
COPY --from=base $APP_PATH/package.json ./package.json
2422

25-
RUN addgroup -g 1001 -S nodejs && \
26-
adduser -S nodejs -u 1001 && \
23+
# Create a non-root user compatible with Debian and BusyBox based images
24+
RUN addgroup --gid 1001 nodejs && \
25+
adduser --uid 1001 --ingroup nodejs nodejs && \
2726
chown -R nodejs:nodejs $APP_PATH/build && \
2827
mkdir -p /var/lib/outline && \
2928
chown -R nodejs:nodejs /var/lib/outline

Dockerfile.base

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG APP_PATH=/opt/outline
2-
FROM node:20-alpine AS deps
2+
FROM node:20-slim AS deps
33

44
ARG APP_PATH
55
WORKDIR $APP_PATH

0 commit comments

Comments
 (0)