Browse Source

dockerfile: add registry to base image specifier & force `rm` for `podman build`

https://github.com/fphammerle/systemctl-mqtt/commit/c9682a0419601ea5c236e1ad6da0d1df0446662a
Fabian Peter Hammerle 4 years ago
parent
commit
50d21ee65f
2 changed files with 4 additions and 2 deletions
  1. 2 0
      CHANGELOG.md
  2. 2 2
      Dockerfile

+ 2 - 0
CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 ### Fixed
 - dockerfile: `chmod` files copied from host to no longer require `o=rX` perms on host
+- dockerfile: add registry to base image specifier for `podman build`
+- dockerfile: add `--force` flag to `rm` invocation to avoid interactive questions while running `podman build`
 
 ## [0.6.0] - 2020-12-19
 ### Added

+ 2 - 2
Dockerfile

@@ -1,6 +1,6 @@
 # not using python:3.*-alpine cause glib-dev package depends on python3
 # https://pkgs.alpinelinux.org/package/v3.11/main/aarch64/glib-dev
-ARG BASE_IMAGE=alpine:3.11
+ARG BASE_IMAGE=docker.io/alpine:3.11
 ARG SOURCE_DIR_PATH=/switchbot-mqtt
 ARG VIRTUALENV_PATH=$SOURCE_DIR_PATH/.venv
 
@@ -30,7 +30,7 @@ ENV PIPENV_CACHE_DIR=/tmp/pipenv-cache
 RUN pipenv install --deploy --verbose \
     && pipenv graph \
     && pipenv run pip freeze \
-    && rm -r .git/ $PIPENV_CACHE_DIR \
+    && rm -rf .git/ $PIPENV_CACHE_DIR \
     && chmod -cR a+rX .
 
 # workaround for broken multi-stage copy