Forráskód Böngészése

dockerfile & docker-compose config: add registry to image specifiers for podman

Fabian Peter Hammerle 3 éve
szülő
commit
9ae29504bc
3 módosított fájl, 5 hozzáadás és 5 törlés
  1. 1 0
      CHANGELOG.md
  2. 1 1
      Dockerfile
  3. 3 4
      docker-compose.yml

+ 1 - 0
CHANGELOG.md

@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `docker-compose`: read-only container root filesystem
 
 ### Fixed
+- `Dockerfile` & `docker-compose`: add registry to base image specifiers for `podman`
 - `docker-compose`: drop capabilities, disallow gaining new privileges
 
 ### Removed

+ 1 - 1
Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.13.4
+FROM docker.io/alpine:3.13.4
 
 ARG MARIADB_CLIENT_PACKAGE_VERSION=10.5.8-r0
 ARG OPENSSH_PACKAGE_VERSION=8.4_p1-r3

+ 3 - 4
docker-compose.yml

@@ -7,7 +7,7 @@ volumes:
 
 services:
   sample_database:
-    image: mariadb:10.4
+    image: docker.io/mariadb:10.4
     environment:
       MYSQL_RANDOM_ROOT_PASSWORD: 'yes'
       MYSQL_USER: someone
@@ -20,7 +20,7 @@ services:
     - database:/var/lib/mysql:rw
   sshd:
     build: .
-    image: fphammerle/mysqldump-sshd
+    image: docker.io/fphammerle/mysqldump-sshd
     environment:
       MYSQLDUMP_ARGS: >-
         --host=sample_database
@@ -36,8 +36,7 @@ services:
     tmpfs:
     - /tmp:nosuid,nodev,exec,size=4k # /tmp/mysqldump.sh
     read_only: true
-    ports:
-    - 127.0.0.1:2200:2200
+    ports: ['127.0.0.1:2200:2200']
     cap_drop: [ALL]
     # strace
     # cap_add: [SYS_PTRACE]