Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.9]
python-version:
- "3.10"

steps:
- uses: actions/checkout@v2
Expand Down
13 changes: 6 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@

#
# Launch a build container so we do not need to care about junk in the production image
#
FROM python:3.8 AS build
FROM python:3.10 AS build

# This is needed to start the Django app
ARG SECRET_KEY=none
Expand Down Expand Up @@ -35,21 +34,21 @@ RUN rm db.sqlite3
#
# The production container
#
FROM python:3.8
FROM python:3.10
EXPOSE 8080

COPY --from=build /app /app
RUN adduser --no-create-home --gecos FALSE --disabled-password finger

RUN apt-get update \
&& apt-get -y install nginx ruby-sass \
&& rm -rf /var/lib/apt/lists/*

COPY --from=build --chown=finger /app /app

RUN pip install -r /app/requirements.txt
WORKDIR /app

RUN adduser --no-create-home --gecos FALSE --disabled-password finger \
&& sed -i "s/XXX_BUILD_DATE_XXX/`date +'%F %T'`/" /app/fingerweb/settings.py \
&& chown -R finger:finger /app
RUN sed -i "s/XXX_BUILD_DATE_XXX/`date +'%F %T'`/" /app/fingerweb/settings.py

ADD conf/nginx.conf /etc/nginx/nginx.conf
ADD entrypoint.sh /app/entrypoint.sh
Expand Down
Loading