updated container files for ghcr.io deployment

nakarma · Jul 12, 2024 · 75df5a8 · 75df5a8
1 parent ca0a2d4
commit 75df5a8
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 7 deletions.
diff --git a/rpios-base/build.sh b/rpios-base/build.sh
@@ -35,7 +35,7 @@ esac
 }
 
 IMG() {
-podman build --squash -t $IMAGE:$ARCH-latest -f ./Containerfile.$ARCH
+podman build --squash -t $REGISTRY$IMAGE:$ARCH-latest -f ./Containerfile.$ARCH
 }
 
 CHECK() {

diff --git a/rpios-base/container.conf b/rpios-base/container.conf
@@ -2,3 +2,4 @@ IMAGE=${PWD##*/}
 ARCH=arm64
 RELEASE=bookworm
 VARIANT=minbase
+REGISTRY=ghcr.io/nakarma/containers/
diff --git a/rpios-gnome/Containerfile.arm64 b/rpios-gnome/Containerfile.arm64
@@ -1,4 +1,4 @@
-FROM nakarma/containers/rpios-mesa:arm64-latest
+FROM ghcr.io/nakarma/containers/rpios-mesa:arm64-latest
 
 ENV DEBIAN_FRONTEND noninteractive
 

diff --git a/rpios-gnome/Containerfile.armhf b/rpios-gnome/Containerfile.armhf
@@ -1,4 +1,4 @@
-FROM nakarma/containers/rpios-mesa:armhf-latest
+FROM ghcr.io/nakarma/containers/rpios-mesa:armhf-latest
 
 ENV DEBIAN_FRONTEND noninteractive
 

diff --git a/rpios-gnome/build.sh b/rpios-gnome/build.sh
@@ -1,9 +1,10 @@
 #!/bin/bash
 
 IMAGE=${PWD##*/}
+REGISTRY=ghcr.io/nakarma/containers/
 
 BUILD() {
-    podman build -t $IMAGE:$ARCH-latest -f $1
+    podman build -t $REGISTRY$IMAGE:$ARCH-latest -f $1
 }
 
 case "$1" in

diff --git a/rpios-mesa/Containerfile.arm64 b/rpios-mesa/Containerfile.arm64
@@ -1,4 +1,4 @@
-FROM nakarma/containers/rpios-base:arm64-latest
+FROM ghcr.io/nakarma/containers/rpios-base:arm64-latest
 
 ENV DEBIAN_FRONTEND noninteractive
 

diff --git a/rpios-mesa/Containerfile.armhf b/rpios-mesa/Containerfile.armhf
@@ -1,4 +1,4 @@
-FROM localhost/rpios-base:armhf-latest
+FROM ghcr.io/nakarma/containers/rpios-base:armhf-latest
 
 ENV DEBIAN_FRONTEND noninteractive
 

diff --git a/rpios-mesa/build.sh b/rpios-mesa/build.sh
@@ -1,9 +1,10 @@
 #!/bin/bash
 
 IMAGE=${PWD##*/}
+REGISTRY=ghcr.io/nakarma/containers/
 
 BUILD() {
-    podman build -t $IMAGE:$ARCH-latest -f $1
+    podman build -t $REGISTRY$IMAGE:$ARCH-latest -f $1
 }
 
 case "$1" in
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,7 +35,7 @@ esac @@
     }
     IMG() {
-    podman build --squash -t $IMAGE:$ARCH-latest -f ./Containerfile.$ARCH
+    podman build --squash -t $REGISTRY$IMAGE:$ARCH-latest -f ./Containerfile.$ARCH
     }
     CHECK() {
@@ Expand Down @@