test

Dockerfile

@@ -1,34 +1,76 @@
-FROM alpine:latest
-LABEL maintainer="victorych"
-RUN apk add --update --no-cache openssh 
-RUN echo 'ListenAddress 0.0.0.0' >> /etc/ssh/sshd_config
-RUN echo 'Port 7860' >> /etc/ssh/sshd_config
-RUN echo 'PasswordAuthentication yes' >> /etc/ssh/sshd_config
-RUN echo 'PermitRootLogin yes' >> /etc/ssh/sshd_config
-RUN echo 'PubkeyAuthentication yes' >> /etc/ssh/sshd_config
-RUN echo 'AllowTcpForwarding yes' >> /etc/ssh/sshd_config
-RUN echo 'PermitTunnel yes' >> /etc/ssh/sshd_config
-RUN echo 'GatewayPorts yes' >> /etc/ssh/sshd_config
-RUN echo 'PidFile /home/user/ssh.pid' >> /etc/ssh/sshd_config
-
-RUN cat /etc/ssh/sshd_config
-
-RUN adduser -h /home/user -s /bin/sh -D user
-RUN echo -n 'user:test' | chpasswd
-USER user
-ENV HOME=/home/user \
-	PATH=/home/user/.local/bin:$PATH
-
-RUN mkdir $HOME/app
-
-WORKDIR $HOME/app
-
 EXPOSE 7860
 
-USER root
+# setup build arguments for version of dependencies to use
+ARG DOCKER_GEN_VERSION=0.10.3
+ARG FOREGO_VERSION=v0.17.0
+
+# Use a specific version of golang to build both binaries
+FROM golang:1.20.3 as gobuilder
+
+# Build docker-gen from scratch
+FROM gobuilder as dockergen
+
+ARG DOCKER_GEN_VERSION
+
+RUN git clone https://github.com/nginx-proxy/docker-gen \
+   && cd /go/docker-gen \
+   && git -c advice.detachedHead=false checkout $DOCKER_GEN_VERSION \
+   && go mod download \
+   && CGO_ENABLED=0 GOOS=linux go build -ldflags "-X main.buildVersion=${DOCKER_GEN_VERSION}" ./cmd/docker-gen \
+   && go clean -cache \
+   && mv docker-gen /usr/local/bin/ \
+   && cd - \
+   && rm -rf /go/docker-gen
+
+# Build forego from scratch
+FROM gobuilder as forego
+
+ARG FOREGO_VERSION
+
+RUN git clone https://github.com/nginx-proxy/forego/ \
+   && cd /go/forego \
+   && git -c advice.detachedHead=false checkout $FOREGO_VERSION \
+   && go mod download \
+   && CGO_ENABLED=0 GOOS=linux go build -o forego . \
+   && go clean -cache \
+   && mv forego /usr/local/bin/ \
+   && cd - \
+   && rm -rf /go/forego
+
+# Build the final image
+FROM nginx:1.23.4
+
+ARG NGINX_PROXY_VERSION
+# Add DOCKER_GEN_VERSION environment variable
+# Because some external projects rely on it
+ARG DOCKER_GEN_VERSION
+ENV NGINX_PROXY_VERSION=${NGINX_PROXY_VERSION} \
+   DOCKER_GEN_VERSION=${DOCKER_GEN_VERSION} \
+   DOCKER_HOST=unix:///tmp/docker.sock
+
+# Install wget and install/updates certificates
+RUN apt-get update \
+   && apt-get install -y -q --no-install-recommends \
+   ca-certificates \
+   wget \
+   && apt-get clean \
+   && rm -r /var/lib/apt/lists/*
+
+
+# Configure Nginx
+RUN echo "daemon off;" >> /etc/nginx/nginx.conf \
+   && sed -i 's/worker_processes  1/worker_processes  auto/' /etc/nginx/nginx.conf \
+   && sed -i 's/worker_connections  1024/worker_connections  10240/' /etc/nginx/nginx.conf \
+   && mkdir -p '/etc/nginx/dhparam'
+
+# Install Forego + docker-gen
+COPY --from=forego /usr/local/bin/forego /usr/local/bin/forego
+COPY --from=dockergen /usr/local/bin/docker-gen /usr/local/bin/docker-gen
+
+COPY network_internal.conf /etc/nginx/
 
-RUN exit 1
+COPY app nginx.tmpl LICENSE /app/
+WORKDIR /app/
 
-CMD ssh-keygen -t ed25519 -f $HOME/.ssh/id_ed25519 && \
-    /usr/sbin/sshd -h $HOME/.ssh/id_ed25519 -D -e "$@"
-# -D
+ENTRYPOINT ["/app/docker-entrypoint.sh"]
+CMD ["forego", "start", "-r"]

Dockerfile_new → Dockerfile_old

@@ -1,24 +1,34 @@
-# Instruction for Dockerfile to create a new image on top of the base image (nvidia/cuda:11.0-base)
 FROM alpine:latest
+LABEL maintainer="victorych"
 RUN apk add --update --no-cache openssh 
-RUN mkdir /var/run/sshd
-RUN echo "root:root" | chpasswd
-RUN sed -i 's/#PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config
-RUN sed -i 's/#PasswordAuthentication yes/PasswordAuthentication yes/' /etc/ssh/sshd_config
 RUN echo 'ListenAddress 0.0.0.0' >> /etc/ssh/sshd_config
 RUN echo 'Port 7860' >> /etc/ssh/sshd_config
-RUN echo 'PidFile /home/user/ssh.pid' >> /etc/ssh/sshd_config
-
+RUN echo 'PasswordAuthentication yes' >> /etc/ssh/sshd_config
+RUN echo 'PermitRootLogin yes' >> /etc/ssh/sshd_config
 RUN echo 'PubkeyAuthentication yes' >> /etc/ssh/sshd_config
 RUN echo 'AllowTcpForwarding yes' >> /etc/ssh/sshd_config
 RUN echo 'PermitTunnel yes' >> /etc/ssh/sshd_config
 RUN echo 'GatewayPorts yes' >> /etc/ssh/sshd_config
+RUN echo 'PidFile /home/user/ssh.pid' >> /etc/ssh/sshd_config
+
+RUN cat /etc/ssh/sshd_config
 
 RUN adduser -h /home/user -s /bin/sh -D user
+RUN echo -n 'user:test' | chpasswd
 USER user
 ENV HOME=/home/user \
 	PATH=/home/user/.local/bin:$PATH
 
+RUN mkdir $HOME/app
+
+WORKDIR $HOME/app
+
 EXPOSE 7860
+
+USER root
+
+RUN exit 1
+
 CMD ssh-keygen -t ed25519 -f $HOME/.ssh/id_ed25519 && \
     /usr/sbin/sshd -h $HOME/.ssh/id_ed25519 -D -e "$@"
+# -D