diff --git a/Dockerfile b/Dockerfile index fa82801e8e1c62104944827eefe95f29fd4a0143..992208254909d845ee54544474996409d4197bcb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,18 +1,12 @@ -# syntax=docker/dockerfile:3 +FROM python:3.10 -# https://sourcery.ai/blog/python-docker/ -# Thanks to Brendan Maginnis! +RUN mkdir /app +WORKDIR /app -FROM python:3.10 as base +RUN curl -fsSL https://deb.nodesource.com/setup_19.x | bash - +RUN apt-get install nodejs && rm -rf /var/lib/apt/lists/* -# Setup env -ENV LANG C.UTF-8 -ENV LC_ALL C.UTF-8 -ENV PYTHONDONTWRITEBYTECODE 1 -ENV PYTHONFAULTHANDLER 1 -ENV DEBIAN_FRONTEND noninteractive - -FROM base AS python-deps +COPY . . # Install pipenv and compilation dependencies RUN pip install -U virtualenv pipenv @@ -25,19 +19,11 @@ COPY Pipfile.lock . RUN PIPENV_VENV_IN_PROJECT=1 pipenv install --deploy RUN PIPENV_VENV_IN_PROJECT=1 pipenv install gunicorn -FROM base AS runtime - -# Copy virtual env from python-deps stage -COPY --from=python-deps /.venv /.venv -ENV PATH="/.venv/bin:$PATH" - -# Create and switch to a new user -RUN useradd --create-home appuser -WORKDIR /home/appuser -USER appuser +RUN bash -c "adduser --disabled-login --quiet --gecos app app && \ + chmod -R o+r /app/ && \ + chmod o+x /app/run.sh" +USER app -# Install application into container -COPY . . - -# Expose 8080 EXPOSE 8080 + +CMD ["bash", "run.sh"] diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 03e01d643fa49d9ee9d24d9350be2d4d64ecf1e0..0000000000000000000000000000000000000000 --- a/docker-compose.yml +++ /dev/null @@ -1,25 +0,0 @@ -version: "3" - -services: - generator: - image: ppm - - environment: - FLASK_APP: generator - FLASK_DEBUG: 0 - - DATABASE_URL: "postgresql://username:password@host/database_name" - - SECRET_KEY: "Åìo«ÑÚ2ûÁn-Û?bV4«Û©ä´ó>°yÆvw7°Ôa" - - JWT_SECRET_KEY: "¤2¯µ&ñðxÈF?a^µ#udbLxgЧ?ÅÏARA®D" - JWT_EXPIRES_AFTER: 604800 - - OIDC_BASE_URL: http://localhost:8080/auth/realms/master/ - OIDC_CLIENT_ID: generator - OIDC_CLIENT_SECRET: "a11a5557-d486-429c-8c8c-7afa0bf1b0be" - - ports: - - "8080:5010" - - command: ["/bin/bash", "./run.sh"]