Compare commits
12
Commits
master
...
archlastpython
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8e77d7c64e | ||
|
|
550419381a | ||
|
|
fc9f4cde3b | ||
|
|
3f2b863f5a | ||
|
|
8231096b4d | ||
|
|
87268abcc3 | ||
|
|
c67e613ba2 | ||
|
|
76985fa799 | ||
|
|
dae43435e4 | ||
|
|
ba7998c636 | ||
|
|
0ac6f00ef0 | ||
|
|
2bdc141e2d |
@@ -15,8 +15,6 @@ venv
|
|||||||
.buildpacks
|
.buildpacks
|
||||||
*.pem
|
*.pem
|
||||||
*.crt
|
*.crt
|
||||||
Pipfile
|
|
||||||
Pipfile.lock
|
|
||||||
.travis.yml
|
.travis.yml
|
||||||
.gitignore
|
.gitignore
|
||||||
.dockerignore
|
.dockerignore
|
||||||
|
|||||||
@@ -38,4 +38,10 @@ jobs:
|
|||||||
context: .
|
context: .
|
||||||
push: false
|
push: false
|
||||||
tags: marcpartensky/website:latest
|
tags: marcpartensky/website:latest
|
||||||
|
cache-from: type=local,src=/tmp/.buildx-cache
|
||||||
|
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
|
||||||
|
|
||||||
|
- name: Move cache
|
||||||
|
run: |
|
||||||
|
rm -rf /tmp/.buildx-cache
|
||||||
|
mv /tmp/.buildx-cache-new /tmp/.buildx-cache
|
||||||
|
|||||||
+15
-11
@@ -1,23 +1,27 @@
|
|||||||
FROM python:3.7.12
|
FROM marcpartensky/paru:latest as builder
|
||||||
# ARG timestamp
|
RUN paru -Syyyu --noconfirm python-pipenv npm make
|
||||||
# ARG commit
|
USER root
|
||||||
|
COPY . /opt/website
|
||||||
|
WORKDIR /opt/website
|
||||||
|
RUN pipenv update
|
||||||
|
RUN pipenv run ./manage.py collectstatic --noinput
|
||||||
|
RUN npm install -g npm@latest
|
||||||
|
RUN npm install
|
||||||
|
|
||||||
|
FROM marcpartensky/paru:latest
|
||||||
LABEL maintainer="marc.partensky@gmail.com"
|
LABEL maintainer="marc.partensky@gmail.com"
|
||||||
LABEL image="https://hub.docker.com/r/marcpartensky/website"
|
LABEL image="https://hub.docker.com/r/marcpartensky/website"
|
||||||
LABEL source="https://github.com/marcpartensky/website"
|
LABEL source="https://github.com/marcpartensky/website"
|
||||||
LABEL link="https://marcpartensky.com"
|
LABEL link="https://marcpartensky.com"
|
||||||
|
RUN paru -Syyyu --noconfirm python npm
|
||||||
|
# ARG timestamp
|
||||||
|
# ARG commit
|
||||||
# LABEL build.timestamp=timestamp
|
# LABEL build.timestamp=timestamp
|
||||||
# LABEL build.commit=commit
|
# LABEL build.commit=commit
|
||||||
|
|
||||||
COPY . /app
|
COPY --from=builder /app /app
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
RUN apt-get update
|
|
||||||
|
|
||||||
RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash
|
|
||||||
RUN apt-get install -y nodejs
|
|
||||||
RUN npm install -g npm@latest
|
|
||||||
RUN npm install
|
|
||||||
|
|
||||||
# No .pyo and easier debugging
|
# No .pyo and easier debugging
|
||||||
ENV PYTHONDONTWRITEBYTECODE 1
|
ENV PYTHONDONTWRITEBYTECODE 1
|
||||||
ENV PYTHONUNBUFFERED 1
|
ENV PYTHONUNBUFFERED 1
|
||||||
|
|||||||
Reference in New Issue
Block a user