Be explicit about image registry

openstreetmap-polska · Jan 15, 2024 · 001bad8 · 001bad8
1 parent 6eeb105
commit 001bad8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 34 deletions.
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -37,7 +37,7 @@ jobs:
         run: |
           nix-shell --pure --run cython-build
 
-      - name: Build Docker image
+      - name: Build container image
         run: |
           echo "IMAGE_PATH=$(nix-build --no-out-link)" >> $GITHUB_ENV
 
@@ -53,7 +53,7 @@ jobs:
             IdentityFile ~/.ssh/id_rsa
           " > ~/.ssh/config
 
-      - name: Upload Docker image
+      - name: Upload container image
         run: |
           scp "${{ env.IMAGE_PATH }}" remote:~
 

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -2,16 +2,8 @@ version: "3"
 
 services:
   db:
-    image: mongo
-    command:
-      [
-        "mongod",
-        "--bind_ip_all",
-        "--setParameter",
-        "transactionLifetimeLimitSeconds=90",
-        "--replSet",
-        "rs0",
-      ]
+    image: docker.io/library/mongo
+    command: ["mongod", "--bind_ip_all", "--setParameter", "transactionLifetimeLimitSeconds=90", "--replSet", "rs0"]
 
     ports:
       - 127.0.0.1:27017:27017
@@ -20,7 +12,7 @@ services:
       - ./data/db:/data/db
 
   db-setup:
-    image: mongo
+    image: docker.io/library/mongo
     entrypoint: ["/bin/sh", "/mongo-init-replica.sh"]
     command: ["127.0.0.1:27017"]
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,23 +2,15 @@ version: "3"
 
 services:
   db:
-    image: mongo
+    image: docker.io/library/mongo
     restart: unless-stopped
-    command:
-      [
-        "mongod",
-        "--bind_ip_all",
-        "--setParameter",
-        "transactionLifetimeLimitSeconds=90",
-        "--replSet",
-        "rs0",
-      ]
+    command: ["mongod", "--bind_ip_all", "--setParameter", "transactionLifetimeLimitSeconds=90", "--replSet", "rs0"]
 
     volumes:
       - ./data/db:/data/db
 
   db-setup:
-    image: mongo
+    image: docker.io/library/mongo
     entrypoint: ["/bin/sh", "/mongo-init-replica.sh"]
     command: ["db:27017"]
 
@@ -59,18 +51,10 @@ services:
       - /mnt/data/${TAG:-dev}/photos:/app/data/photos
 
   cache:
-    image: varnish:alpine
+    image: docker.io/library/varnish:alpine
     restart: unless-stopped
     user: root
-    command:
-      [
-        "varnishd",
-        "-F",
-        "-f",
-        "/etc/varnish/default.vcl",
-        "-s",
-        "file,/var/lib/varnish/varnish_storage.bin,2G",
-      ]
+    command: ["varnishd", "-F", "-f", "/etc/varnish/default.vcl", "-s", "file,/var/lib/varnish/varnish_storage.bin,2G"]
 
     depends_on:
       - app