From 26ab4989eaac57c88939b61cefe8217d7c6a7fbc Mon Sep 17 00:00:00 2001 From: manu Date: Thu, 6 Jun 2024 15:51:56 +0200 Subject: [PATCH] Reorder FROM instruction in Dockerfiles 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. --- client/Dockerfile | 3 +-- proxy/Dockerfile | 2 +- server/Dockerfile | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/client/Dockerfile b/client/Dockerfile index 8729a645..0ff14fa4 100644 --- a/client/Dockerfile +++ b/client/Dockerfile @@ -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 diff --git a/proxy/Dockerfile b/proxy/Dockerfile index 93b83746..cecd5b77 100644 --- a/proxy/Dockerfile +++ b/proxy/Dockerfile @@ -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 diff --git a/server/Dockerfile b/server/Dockerfile index 585f49a8..79c08aee 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -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