Skip to content

Commit 79a8a9d

Browse files
authored
Cleanup unused images after deployment (#451)
* Cleanup unused images after deployment * Make docker CMD runner scripts consistent * Make mustache template file extensions explicit
1 parent ab6de28 commit 79a8a9d

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

docker/client/run-celery.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

33
exec celery \
4-
--app=opwen_email_client.webapp.tasks \
4+
--app="opwen_email_client.webapp.tasks" \
55
worker \
66
--loglevel="${LOKOLE_LOG_LEVEL}" \
77
--concurrency="${QUEUE_WORKERS}"

docker/nginx/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ FROM nginx:stable
88

99
COPY --from=builder /usr/bin/mo /usr/bin/mo
1010
COPY docker/nginx/static /static
11-
COPY docker/nginx/nginx.conf.template /app/nginx.conf.template
12-
COPY docker/nginx/server.conf.template /app/server.conf.template
11+
COPY docker/nginx/*.mustache /app/
1312
COPY docker/nginx/run-nginx.sh /app/run-nginx.sh
1413

1514
RUN mkdir -p /var/cache/nginx /etc/nginx/modules-enabled /etc/nginx/sites-enabled \
File renamed without changes.

docker/nginx/run-nginx.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
mo < /app/nginx.conf.template > /app/nginx.conf
4-
mo < /app/server.conf.template > /etc/nginx/sites-enabled/server.conf
3+
mo < /app/nginx.conf.mustache > /app/nginx.conf
4+
mo < /app/server.conf.mustache > /etc/nginx/sites-enabled/server.conf
55

6-
nginx -c "/app/nginx.conf" -p "${PWD}" -g "daemon off;"
6+
exec nginx -c "/app/nginx.conf" -p "${PWD}" -g "daemon off;"
File renamed without changes.

docker/setup/vm.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ if [[ "$1" != "install" ]]; then
77
cd - || exit 99
88
docker-compose -f /home/opwen/lokole/docker/docker-compose.prod.yml pull || exit 2
99
docker-compose -f /home/opwen/lokole/docker/docker-compose.prod.yml up -d || exit 3
10+
docker system prune -a -f
1011
exit 0
1112
fi
1213

0 commit comments

Comments
 (0)