prokop/docker-crawl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated Dockerfiles and entrypoints

Browse Source
This commit is contained in:
FrozenFOXX
2020-09-01 21:42:38 -07:00
parent 04806dbe16
commit 93545c3aa1
5 changed files with 41 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Dockerfile
View File

@@ -54,9 +54,8 @@ COPY util/webtiles-init-player.sh /app/util/
COPY webserver/config.py /app/webserver/ COPY webserver/config.py /app/webserver/
COPY webserver/games.d/* /app/webserver/games.d/ COPY webserver/games.d/* /app/webserver/games.d/
# Adjustments for the container # Copy over the entrypoint
RUN mkdir -p /data/rcs && \ COPY scripts/entrypoint-webtiles.sh /app/entrypoint.sh
mkdir -p /data/webserver
# Clean up unnecessary package lists # Clean up unnecessary package lists
RUN rm -rf /var/lib/apt/lists/* RUN rm -rf /var/lib/apt/lists/*
@@ -68,4 +67,4 @@ EXPOSE 8080
WORKDIR /app WORKDIR /app
# Launch WebTiles server # Launch WebTiles server
CMD [ "./webserver/server.py" ] ENTRYPOINT [ "./entrypoint.sh" ]

9
Dockerfile.tiles
View File

@@ -46,9 +46,8 @@ COPY --from=builder /app/ /app/
# Copy over custom configs # Copy over custom configs
COPY settings/init.txt /app/settings/ COPY settings/init.txt /app/settings/
# Adjustments for the container # COPY over the entrypoint
RUN mkdir -p /data/rcs && \ COPY scripts/entrypoint-tiles.sh /app/entrypoint.sh
mkdir -p /data/webserver
# Clean up unnecessary package lists # Clean up unnecessary package lists
RUN rm -rf /var/lib/apt/lists/* RUN rm -rf /var/lib/apt/lists/*
@@ -59,5 +58,5 @@ EXPOSE 8080
# Set the WORKDIR # Set the WORKDIR
WORKDIR /app WORKDIR /app
# Launch WebTiles server # Launch Tiles
CMD [ "./webserver/server.py" ] ENTRYPOINT [ "./entrypoint.sh" ]

7
Dockerfile.webtiles
View File

@@ -54,9 +54,8 @@ COPY util/webtiles-init-player.sh /app/util/
COPY webserver/config.py /app/webserver/ COPY webserver/config.py /app/webserver/
COPY webserver/games.d/* /app/webserver/games.d/ COPY webserver/games.d/* /app/webserver/games.d/
# Adjustments for the container # Copy over the entrypoint
RUN mkdir -p /data/rcs && \ COPY scripts/entrypoint-webtiles.sh /app/entrypoint.sh
mkdir -p /data/webserver
# Clean up unnecessary package lists # Clean up unnecessary package lists
RUN rm -rf /var/lib/apt/lists/* RUN rm -rf /var/lib/apt/lists/*
@@ -68,4 +67,4 @@ EXPOSE 8080
WORKDIR /app WORKDIR /app
# Launch WebTiles server # Launch WebTiles server
CMD [ "./webserver/server.py" ] ENTRYPOINT [ "./entrypoint.sh" ]

12
scripts/entrypoint-tiles.sh Executable file
View File

@@ -0,0 +1,12 @@
#!/usr/bin/env ash
# Variables
APPDIR=${APPDIR:-"/app"}
DATA_DIR=${DATA_DIR:-"/data"}
# Functions
# Logic
cd ${APPDIR}
./webserver/server.py $@

19
scripts/entrypoint-webtiles.sh Executable file
View File

@@ -0,0 +1,19 @@
#!/usr/bin/env ash
# Variables
APPDIR=${APPDIR:-"/app"}
DATA_DIR=${DATA_DIR:-"/data"}
# Functions
## Create server directories if they do not exist
create_server_dirs()
{
mkdir -p ${DATA_DIR}/rcs
mkdir -p ${DATA_DIR}/webserver
}
# Logic
cd ${APPDIR}
./webserver/server.py $@