Skip to content

Commit

Permalink
Move image base to linuxserverio alpine base
Browse files Browse the repository at this point in the history
  • Loading branch information
FoxxMD committed Mar 17, 2023
1 parent 3721099 commit 7bc2ba0
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 4 deletions.
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
*
!maloja
!container
!Containerfile
!requirements.txt
!pyproject.toml
Expand Down
8 changes: 4 additions & 4 deletions Containerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.15
FROM lsiobase/alpine:3.17 as base
# Python image includes two Python versions, so use base Alpine

# Based on the work of Jonathan Boeckel <jonathanboeckel1996@gmail.com>
Expand All @@ -23,10 +23,12 @@ RUN \
pip install --no-cache-dir -r requirements.txt && \
apk del .build-deps

COPY container/root/ /


# no chance for caching below here

COPY . .
COPY --chown=abc:abc . .

RUN pip install /usr/src/app

Expand All @@ -36,5 +38,3 @@ ENV MALOJA_SKIP_SETUP=yes
ENV PYTHONUNBUFFERED=1

EXPOSE 42010
# use exec form for better signal handling https://docs.docker.com/engine/reference/builder/#entrypoint
ENTRYPOINT ["maloja", "run"]
Empty file.
7 changes: 7 additions & 0 deletions container/root/etc/s6-overlay/s6-rc.d/svc-python/run
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/usr/bin/with-contenv bash

# used https://github.com/linuxserver/docker-wikijs/blob/master/root/etc/s6-overlay/s6-rc.d/svc-wikijs/run as a template

echo -e "\nMaloja is starting!"
exec \
s6-setuidgid abc python -m maloja run
1 change: 1 addition & 0 deletions container/root/etc/s6-overlay/s6-rc.d/svc-python/type
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
longrun
Empty file.

0 comments on commit 7bc2ba0

Please sign in to comment.