fixed docker

Author: JeyDi

Docker/app.dockerfile

@@ -1,12 +1,12 @@
-FROM --platform=linux/amd64 python:3.9-slim-buster as python
+FROM --platform=linux/amd64 python:3.10.12-slim-buster as python
 
 # Metadata
-LABEL name="PBG Website"
+LABEL name="Mkdocs website"
 LABEL maintainer="PBG"
 LABEL version="0.1"
 
 ARG YOUR_ENV="virtualenv"
-ARG POETRY_VERSION="1.5.1"
+ARG POETRY_VERSION="1.7.1"
 
 ENV YOUR_ENV=${YOUR_ENV} \
     PYTHONDONTWRITEBYTECODE=1 \
@@ -31,22 +31,8 @@ ENV PATH="$POETRY_HOME/bin:$PATH"
 # COPY bin/ssh-config.sh /usr/bin
 # RUN chmod +x /usr/bin/ssh-config.sh
 
-# Install libraries
 RUN DEBIAN_FRONTEND=noninteractive apt update && apt install -y \
-    libpq-dev gcc wget gnupg2 curl openssh-client git make build-essential \
-    make build-essential libssl-dev zlib1g-dev \
-    libbz2-dev libreadline-dev libsqlite3-dev wget curl llvm \
-    libncursesw5-dev xz-utils tk-dev libxml2-dev libxmlsec1-dev libffi-dev liblzma-dev \
-    pngquant optipng
-
-# # add custom host file for your services
-# COPY hosts tmp/
-# ADD hosts /tmp/hosts
-# # Warning: if you test on M1 and arch64 architecture you could have an issue with this line
-# RUN mkdir -p -- /lib-override && cp /lib/x86_64-linux-gnu/libnss_files.so.2 /lib-override
-# # If you are using mac or arch64 change X86_64-linux-gnu with aarch64-linux-gnu
-# RUN perl -pi -e 's:/etc/hosts:/tmp/hosts:g' /lib-override/libnss_files.so.2
-# ENV LD_LIBRARY_PATH /lib-override
+    wget curl libpq-dev gcc wget gnupg2 curl openssh-client make git build-essential
 
 RUN  wget -O install-poetry.py https://install.python-poetry.org/ \
     && python install-poetry.py --version ${POETRY_VERSION}
@@ -64,6 +50,7 @@ RUN poetry install --no-interaction --no-ansi --only main && \
 RUN poetry cache clear --all pypi
 
 COPY docs ./docs
+COPY myapp ./myapp
 COPY Makefile .
 COPY mkdocs.yml .
 

Docker/test.dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/pythonbiellagroup/dockbase/python-base:0.0.3 as python
+FROM --platform=linux/amd64 ghcr.io/pythonbiellagroup/dockbase/python-base:0.0.4 as python
 
 # Metadata
 LABEL name="PBG Website"
@@ -8,10 +8,11 @@ LABEL version="0.1"
 # Project Python definition
 WORKDIR /app
 
-#Copy all the project files
-COPY pyproject.toml .
-COPY poetry.lock .
-COPY poetry.toml .
+#Copy poetry files
+COPY pyproject.toml poetry.lock poetry.toml ./
+
+RUN poetry install --no-interaction --no-ansi --only main && \
+    rm -rf /root/.cache/pypoetry
 
 # You need to create a .env file in your project to download the private package from github
 # With GHCR_USERNAME and GHCR_TOKEN
@@ -21,8 +22,7 @@ COPY poetry.toml .
 # RUN . /app/.env && poetry config http-basic.mkdocs ${GHCR_USERNAME} ${GHCR_TOKEN} && \
 #     poetry install --no-interaction --no-ansi --only main && \
 #     rm -rf /root/.cache/pypoetry
-RUN poetry install --no-interaction --no-ansi --only main && \
-    rm -rf /root/.cache/pypoetry
+
 RUN poetry cache clear --all pypi
 
 COPY docs ./docs
@@ -32,9 +32,10 @@ COPY Makefile .
 COPY mkdocs.yml .
 # COPY mkdocs.insiders.yml .
 
-RUN make docs_build
+# RUN make docs_build
+RUN mkdocs build --clean --quiet --config-file mkdocs.yml
 
-FROM nginx as deploy
+FROM --platform=linux/amd64 nginx as deploy
 
 COPY --from=python /app/site /usr/share/nginx/html