Browse Source

Merge pull request #128 from SH-Daemon/docker-fixes

fixing docker
dev
Per-Arne Andersen 3 years ago
committed by GitHub
parent
commit
27d164b835
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 19
      Dockerfile
  2. 5
      docker-compose.yaml

19
Dockerfile

@ -1,23 +1,14 @@
FROM ubuntu:20.04
ENV TZ=Europe/Minsk
FROM node:14-alpine AS BUILD_IMAGE
ENV DEBIAN_FRONTEND=noninteractive
#COPY ./wg-manager /tmp/build
RUN mkdir -p /tmp/build
WORKDIR /tmp/build
RUN apt-get update && apt-get install -y \
nodejs \
npm \
&& rm -rf /var/lib/apt/lists/*
RUN npm cache clean --force
RUN npm install
COPY ./wg-manager-frontend /tmp/build
RUN npm install --unsafe-perm
RUN npm install @angular/cli
RUN node_modules/@angular/cli/bin/ng build --configuration="production"
RUN rm -rf node_modules
RUN apt-get purge nodejs npm -y
FROM ubuntu:20.04
LABEL maintainer="per@sysx.no"
@ -37,8 +28,6 @@ RUN apt-get update && apt-get install -y \
python3 \
python3-pip \
python3-dev \
python3-gunicorn \
python3-uvicorn \
gunicorn \
&& rm -rf /var/lib/apt/lists/*
@ -56,7 +45,7 @@ COPY docker/ ./startup
RUN chmod 700 ./startup/start.py
# Copy build files from previous step
COPY --from=0 /tmp/build/dist /app/build
COPY --from=BUILD_IMAGE /tmp/build/dist /app/build
ENTRYPOINT python3 startup/start.py

5
docker-compose.yaml

@ -19,11 +19,10 @@ services:
PORT: 8888
ADMIN_USERNAME: admin
ADMIN_PASSWORD: admin
WEB_CONCURRENCY: 2
WEB_CONCURRENCY: 1
SERVER_INIT_INTERFACE_START: 1
#endpoint dynamic variables: ||external|| , ||internal||
SERVER_INIT_INTERFACE: '{"address":"10.0.200.1","v6_address":"fd42:42:42::1","subnet":24,"v6_subnet":64,"interface":"wg0","listen_port":"51820","endpoint":"server","dns":"10.0.200.1,8.8.8.8","private_key":"","public_key":"","post_up":"","post_down":"","configuration":"","is_running":false,"peers":[]}'
SERVER_INIT_INTERFACE: '{"address":"10.0.200.1","v6_support":"true", "v6_address":"fd42:42:42::1","subnet":24,"v6_subnet":64,"interface":"wg0","listen_port":"51820","endpoint":"server","dns":"10.0.200.1,8.8.8.8","private_key":"","public_key":"","post_up":"","post_down":"","configuration":"","is_running":false,"peers":[]}'
SERVER_STARTUP_API_KEY: thisisasecretkeythatnobodyknows
networks:
- wg-manager-net

Loading…
Cancel
Save