Skip to content

rebase #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stonezdj merged 1 commit into from
Jun 11, 2026
Merged

rebase #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build_base_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

16 changes: 8 additions & 8 deletions multi_arch/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Loading