Skip to content

Commit 31365f3

Browse files
committed
🐳 refactor to add user
1 parent 4f4f996 commit 31365f3

File tree

2 files changed

+21
-17
lines changed

2 files changed

+21
-17
lines changed

Dockerfile

+19-10
Original file line numberDiff line numberDiff line change
@@ -31,22 +31,31 @@ FROM node:16.13.2-alpine
3131
ENV PORT=80 \
3232
DIRECTORY=/app \
3333
IS_DOCKER=true \
34-
UID=1000 \
35-
GUID=1000
34+
USER=docker \
35+
UID=12345 \
36+
GID=23456
3637

37-
# Create a group and user
38-
RUN addgroup --gid ${GUID} application \
39-
&& adduser --no-create-home --uid ${UID} application application
38+
# Install tini for initialization and tzdata for setting timezone
39+
RUN apk add --no-cache tzdata tini \
40+
# Add group
41+
&& addgroup --gid ${GID} "${USER}" \
42+
# Add user
43+
&& adduser \
44+
--disabled-password \
45+
--ingroup "${USER}" \
46+
--gecos "" \
47+
--home "${DIRECTORY}" \
48+
--no-create-home \
49+
--uid "$UID" \
50+
"$USER"
51+
52+
USER ${USER}
4053

41-
USER application
4254
# Create and set the working directory
4355
WORKDIR ${DIRECTORY}
4456

45-
# Install tini for initialization and tzdata for setting timezone
46-
RUN apk add --no-cache tzdata tini
47-
4857
# Copy built application from build phase
49-
COPY --from=BUILD_IMAGE /app ./
58+
COPY --from=BUILD_IMAGE --chown=${USER}:${USER} /app ./
5059

5160
# Finally, run start command to serve up the built application
5261
ENTRYPOINT [ "/sbin/tini", "--" ]

docker-compose.yml

+2-7
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ services:
77
container_name: Dashy
88

99
# Pull latest image from DockerHub
10-
image: lissy93/dashy
10+
# image: lissy93/dashy
1111

1212
# To build from source, replace 'image: lissy93/dashy' with 'build: .'
13-
# build: .
13+
build: .
1414

1515
# Or, to use a Dockerfile for your archtecture, uncomment the following
1616
# context: .
@@ -32,11 +32,6 @@ services:
3232
environment:
3333
- NODE_ENV=production
3434
# Specify your user ID and group ID. You can find this by running `id -u` and `id -g`
35-
# - UID=1000
36-
# - GID=1000
37-
38-
# Specify restart policy
39-
restart: unless-stopped
4035

4136
# Configure healthchecks
4237
healthcheck:

0 commit comments

Comments
 (0)