Skip to content

Commit

Permalink
Fixed various build issues
Browse files Browse the repository at this point in the history
  • Loading branch information
SakiiR committed Nov 3, 2022
1 parent dd56fbd commit 00bde33
Show file tree
Hide file tree
Showing 6 changed files with 48 additions and 30 deletions.
3 changes: 1 addition & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ services:
##
powerdns-db:
container_name: pm_powerdns-db
image: mariadb
image: mariadb@sha256:0c3c560359a6da112134a52122aa9b78fec5f9dd292a01ee7954de450f25f0c1
environment:
MYSQL_ROOT_PASSWORD: *PDNS_MYSQL_ROOT_PASSWORD
MYSQL_DATABASE: *PDNS_MYSQL_DATABASE
Expand Down Expand Up @@ -63,7 +63,6 @@ services:
context: ./dockers/traefik
args:
LETS_ENCRYPT_EMAIL: *LETS_ENCRYPT_EMAIL

ports:
- "80:80"
- "443:443"
Expand Down
1 change: 1 addition & 0 deletions dockers/manager/.dockerignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
/front/node_modules
/back/.venv
6 changes: 4 additions & 2 deletions dockers/manager/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM node:15.10.0 as build-front
WORKDIR /app
COPY front/package*.json ./
COPY front/package.json ./
COPY front/yarn.lock ./
RUN yarn install
COPY front/ ./
RUN yarn build
Expand All @@ -12,8 +13,9 @@ WORKDIR /usr/src/app
RUN apt update && apt install -y docker.io
RUN pip install --upgrade pip poetry
COPY back/pyproject.toml ./
COPY back/poetry.lock ./
RUN poetry install
COPY back/ ./
COPY --from=build-front /app/dist/spa/ static/
EXPOSE 5000/tcp
CMD poetry run uvicorn --host 0.0.0.0 --port 5000 --log-level warning app:app
CMD poetry run uvicorn --host 0.0.0.0 --port 5000 --log-level warning app:app ; sleep 9000000
64 changes: 40 additions & 24 deletions dockers/manager/back/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dockers/manager/back/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ psutil = "^5.8.0"
python-magic = "^0.4.24"
python-multipart = "^0.0.5"
dnspython = "^2.1.0"
uvicorn = "0.19.0"

[tool.poetry.dev-dependencies]
uvicorn = "^0.13.4"
black = "^21.4b"
requests = "^2.25.1"

Expand Down
2 changes: 1 addition & 1 deletion dockers/powerdns/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:latest
FROM ubuntu@sha256:adf73ca014822ad8237623d388cedf4d5346aa72c270c5acc01431cc93e18e2d
ARG API_KEY
# Setup powerdns repositories
RUN apt-get update && apt-get install curl gnupg dnsutils rsyslog -y
Expand Down

0 comments on commit 00bde33

Please sign in to comment.