Skip to content

Commit

Permalink
Reorder FROM instruction in Dockerfiles
Browse files Browse the repository at this point in the history
The order of the Docker instructions in Dockerfiles for both server, client, and proxy has been adjusted, so the FROM instruction is now the first instruction in each Dockerfile. This change complies with best practices for Dockerfile instruction order.
  • Loading branch information
manu committed Jun 6, 2024
1 parent 2b81a87 commit 26ab498
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
3 changes: 1 addition & 2 deletions client/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
FROM node:22-alpine as base
LABEL org.opencontainers.image.source=https://github.com/SquirrelCorporation/SquirrelServersManager
LABEL org.opencontainers.image.description="SSM Client"
LABEL org.opencontainers.image.licenses="GNU AFFERO GENERAL PUBLIC LICENSE"

FROM node:22-alpine as base

WORKDIR /client
RUN npm install -g npm@latest
RUN npm install -g @umijs/max
Expand Down
2 changes: 1 addition & 1 deletion proxy/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM nginx:1.25.5
LABEL org.opencontainers.image.source=https://github.com/SquirrelCorporation/SquirrelServersManager
LABEL org.opencontainers.image.description="SSM Proxy"
LABEL org.opencontainers.image.licenses="GNU AFFERO GENERAL PUBLIC LICENSE"

FROM nginx:1.25.5
COPY default.conf /etc/nginx/conf.d
COPY www/index.html /usr/share/nginx/html/custom.html
3 changes: 1 addition & 2 deletions server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
FROM node:22-alpine as base
LABEL org.opencontainers.image.source=https://github.com/SquirrelCorporation/SquirrelServersManager
LABEL org.opencontainers.image.description="SSM Server"
LABEL org.opencontainers.image.licenses="GNU AFFERO GENERAL PUBLIC LICENSE"

FROM node:22-alpine as base

WORKDIR /server
RUN apk update && apk add ansible nmap sudo openssh sshpass py3-pip expect
RUN npm install -g npm@latest
Expand Down

0 comments on commit 26ab498

Please sign in to comment.