From 08981df8ca272f5dc91c0506f88bc20ccc6e656b Mon Sep 17 00:00:00 2001
From: Dan Helfman <witten@torsion.org>
Date: Mon, 10 Apr 2023 22:13:20 -0700
Subject: [PATCH] Use explicit image names so that Podman will work.

---
 Dockerfile      | 4 ++--
 dev-compose.yml | 4 ++--
 scripts/build   | 2 +-
 scripts/push    | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1cadf58..b9676e5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM bitnami/minideb:bullseye as build
+FROM docker.io/bitnami/minideb:bullseye as build
 
 ARG tini_version=0.19.0
 
@@ -22,7 +22,7 @@ RUN install_packages \
     && wget --quiet https://github.com/krallin/tini/releases/download/v${tini_version}/tini \
          --output-document=/sbin/tini
 
-FROM bitnami/minideb:bullseye
+FROM docker.io/bitnami/minideb:bullseye
 
 COPY --from=build /usr/local/lib/python3.9 /usr/local/lib/python3.9
 COPY --from=build /usr/local/bin /usr/local/bin
diff --git a/dev-compose.yml b/dev-compose.yml
index 263ec55..ebe5f1a 100644
--- a/dev-compose.yml
+++ b/dev-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   mediagoblin-database:
-    image: postgres:14.3-alpine
+    image: docker.io/postgres:14.3-alpine
     restart: always
     environment:
       POSTGRES_USER: mediagoblin
@@ -11,7 +11,7 @@ services:
     networks:
       - default
   mediagoblin:
-    image: witten/mediagoblin
+    image: projects.torsion.org/witten/mediagoblin-docker
     restart: always
     environment:
       NOTIFICATION_EMAIL: dev@torsion.org
diff --git a/scripts/build b/scripts/build
index 2aefc23..cf580cd 100755
--- a/scripts/build
+++ b/scripts/build
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-docker build --no-cache -t witten/mediagoblin .
+docker build --no-cache -t projects.torsion.org/witten/mediagoblin-docker .
diff --git a/scripts/push b/scripts/push
index 45c4b72..a96c5e2 100755
--- a/scripts/push
+++ b/scripts/push
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-docker push witten/mediagoblin
+docker push projects.torsion.org/witten/mediagoblin-docker