Compare commits
10 Commits
1c2b737ed8
...
6c4629da43
Author | SHA1 | Date | |
---|---|---|---|
6c4629da43 | |||
f7af97d64e | |||
8a4d4da641 | |||
3d66afd02e | |||
e01a8d8639 | |||
65dc580dac | |||
1af41ee86d | |||
fa7fdc7532 | |||
3042c52c9f | |||
09480676d4 |
@ -6,20 +6,14 @@ env:
|
|||||||
DOCKER_HOST: tcp://127.0.0.1:2375
|
DOCKER_HOST: tcp://127.0.0.1:2375
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build-x86_64:
|
||||||
strategy:
|
name: Build Docker Image
|
||||||
matrix:
|
runs-on: docker-x86_64
|
||||||
arch:
|
|
||||||
- x86_64
|
|
||||||
- arm64
|
|
||||||
|
|
||||||
name: Build Docker ${{ matrix.arch }} Image
|
|
||||||
runs-on: docker-${{ matrix.arch }}
|
|
||||||
container:
|
container:
|
||||||
image: docker:dind
|
image: docker:dind
|
||||||
privileged: true
|
privileged: true
|
||||||
env:
|
env:
|
||||||
ARCH: ${{ matrix.arch }}
|
ARCH: x86_64
|
||||||
VERSIONARCH: ${{ env.VERSION }}-${{ env.ARCH }}
|
VERSIONARCH: ${{ env.VERSION }}-${{ env.ARCH }}
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
@ -55,56 +49,56 @@ jobs:
|
|||||||
uses: docker/build-push-action@v5
|
uses: docker/build-push-action@v5
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
file: docker/Dockerfile
|
file: ./Dockerfile
|
||||||
push: true
|
push: true
|
||||||
tags: "${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSIONARCH }}"
|
tags: "${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSIONARCH }}"
|
||||||
|
|
||||||
# build-arm64:
|
build-arm64:
|
||||||
# name: Build Docker arm64 Image
|
name: Build Docker Image
|
||||||
# runs-on: docker-arm64
|
runs-on: docker-arm64
|
||||||
# container:
|
container:
|
||||||
# image: docker:dind
|
image: docker:dind
|
||||||
# privileged: true
|
privileged: true
|
||||||
# env:
|
env:
|
||||||
# ARCH: arm64
|
ARCH: arm64
|
||||||
# VERSIONARCH: ${{ env.VERSION }}-${{ env.ARCH }}
|
VERSIONARCH: ${{ env.VERSION }}-${{ env.ARCH }}
|
||||||
#
|
|
||||||
# steps:
|
steps:
|
||||||
# - name: Environment Setup
|
- name: Environment Setup
|
||||||
# run: |
|
run: |
|
||||||
# # If we have a proxy use it
|
# If we have a proxy use it
|
||||||
# if [ -n "${HTTP_PROXY}" ]; then echo "HTTP PROXY [${HTTP_PROXY}]"; sed -i -e s'/https/http/' /etc/apk/repositories; fi
|
if [ -n "${HTTP_PROXY}" ]; then echo "HTTP PROXY [${HTTP_PROXY}]"; sed -i -e s'/https/http/' /etc/apk/repositories; fi
|
||||||
# # Some pre-reqs
|
# Some pre-reqs
|
||||||
# apk add git curl nodejs
|
apk add git curl nodejs
|
||||||
# # Start docker
|
# Start docker
|
||||||
# ( dockerd --host=tcp://0.0.0.0:2375 --tls=false & ) && sleep 3
|
( dockerd --host=tcp://0.0.0.0:2375 --tls=false & ) && sleep 3
|
||||||
# ## Some debugging info
|
## Some debugging info
|
||||||
# # docker info && docker version
|
# docker info && docker version
|
||||||
# # env|sort
|
# env|sort
|
||||||
#
|
|
||||||
# - name: Registry FQDN Setup
|
- name: Registry FQDN Setup
|
||||||
# id: registry
|
id: registry
|
||||||
# run: |
|
run: |
|
||||||
# registry=${{ github.server_url }}
|
registry=${{ github.server_url }}
|
||||||
# echo "registry=${registry##http*://}" >> "$GITHUB_OUTPUT"
|
echo "registry=${registry##http*://}" >> "$GITHUB_OUTPUT"
|
||||||
#
|
|
||||||
# - name: Container Registry Login
|
- name: Container Registry Login
|
||||||
# uses: docker/login-action@v2
|
uses: docker/login-action@v2
|
||||||
# with:
|
with:
|
||||||
# registry: ${{ steps.registry.outputs.registry }}
|
registry: ${{ steps.registry.outputs.registry }}
|
||||||
# username: ${{ gitea.actor }}
|
username: ${{ gitea.actor }}
|
||||||
# password: ${{ secrets.PKG_WRITE_TOKEN }}
|
password: ${{ secrets.PKG_WRITE_TOKEN }}
|
||||||
#
|
|
||||||
# - name: Code Checkout
|
- name: Code Checkout
|
||||||
# uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
#
|
|
||||||
# - name: Build and Push Docker Image
|
- name: Build and Push Docker Image
|
||||||
# uses: docker/build-push-action@v5
|
uses: docker/build-push-action@v5
|
||||||
# with:
|
with:
|
||||||
# context: .
|
context: .
|
||||||
# file: docker/Dockerfile
|
file: ./Dockerfile
|
||||||
# push: true
|
push: true
|
||||||
# tags: "${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSIONARCH }}"
|
tags: "${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSIONARCH }}"
|
||||||
|
|
||||||
manifest:
|
manifest:
|
||||||
name: Final Docker Image Manifest
|
name: Final Docker Image Manifest
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# NAME docker/php
|
# NAME leenooks/php
|
||||||
# VERSION 8.3-fpm-alpine
|
# VERSION 8.3-fpm-alpine
|
||||||
|
|
||||||
FROM php:8.3-fpm-alpine
|
FROM php:8.3-fpm-alpine
|
@ -1,7 +1,7 @@
|
|||||||
# NAME docker/php
|
# NAME leenooks/php
|
||||||
# VERSION 8.3-fpm-test
|
# VERSION 8.3-fpm-test
|
||||||
|
|
||||||
FROM gitea.dege.au/docker/php:8.3-fpm
|
FROM registry.dege.au/leenooks/php:8.3-fpm
|
||||||
|
|
||||||
# Add xdebug
|
# Add xdebug
|
||||||
RUN apk --no-cache add linux-headers \
|
RUN apk --no-cache add linux-headers \
|
Loading…
x
Reference in New Issue
Block a user