diff --git a/.github/workflows/build_base_test.yaml b/.github/workflows/build_base_test.yaml index c5b1980..24ae07c 100644 --- a/.github/workflows/build_base_test.yaml +++ b/.github/workflows/build_base_test.yaml @@ -36,17 +36,17 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - - name: Build and push firstfloor/photon:5.0 multi-arch manifest + - name: Build and push firstfloor/zdjphoton:5.0 multi-arch manifest run: | set -x if [ -n "${{ secrets.DOCKERHUB_USERNAME }}" ] && [ -n "${{ secrets.DOCKERHUB_TOKEN }}" ]; then echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin docker buildx build --platform linux/amd64,linux/arm64 \ - -f multi_arch/Dockerfile -t firstfloor/photon:5.0 --push . + -f multi_arch/Dockerfile -t firstfloor/zdjphoton:5.0 --push . docker logout else echo "Secrets not available, building without push" docker buildx build --platform linux/amd64,linux/arm64 \ - -f multi_arch/Dockerfile -t firstfloor/photon:5.0 . + -f multi_arch/Dockerfile -t firstfloor/zdjphoton:5.0 . fi diff --git a/multi_arch/Dockerfile b/multi_arch/Dockerfile index d6f51b8..0f1f802 100644 --- a/multi_arch/Dockerfile +++ b/multi_arch/Dockerfile @@ -1,9 +1,9 @@ -FROM photon:5.0 +FROM firstfloor/photon:5.0 -# RUN tdnf install photon-repos -y \ -# && sed -i 's/enabled\s*=.*/enabled=0/g' /etc/yum.repos.d/*.repo \ -# && sed -i 's/enabled\s*=.*/enabled=1/g' /etc/yum.repos.d/photon-snapshot.repo \ -# && tdnf clean all \ -# && tdnf --disablerepo="*" --enablerepo="photon-snapshot" makecache \ -# && tdnf --disablerepo="*" --enablerepo="photon-snapshot" update -y \ -# && tdnf clean all +RUN tdnf install photon-repos -y \ + && sed -i 's/enabled\s*=.*/enabled=0/g' /etc/yum.repos.d/*.repo \ + && sed -i 's/enabled\s*=.*/enabled=1/g' /etc/yum.repos.d/photon-snapshot.repo \ + && tdnf clean all \ + && tdnf --disablerepo="*" --enablerepo="photon-snapshot" makecache \ + && tdnf --disablerepo="*" --enablerepo="photon-snapshot" update -y \ + && tdnf clean all