Skip to content

Commit 069bfd0

Browse files
committed
Remove xcp-ng-dev-env-create
Now that the images are easily available on ghcr.io. It makes the completion easier to use for the main tool. Signed-off-by: Gaëtan Lehmann <[email protected]>
1 parent 644d3ed commit 069bfd0

14 files changed

+9
-10
lines changed

.github/workflows/docker.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ jobs:
2323
- run: echo "VERSION=$(cat ./src/xcp_ng_dev/files/version.txt | tr -d '\n')" >> $GITHUB_ENV
2424
- uses: docker/build-push-action@v5 # Using v5 for latest features
2525
with:
26-
context: ./src/xcp_ng_dev/
27-
file: ./src/xcp_ng_dev/files/Dockerfile-8.x
26+
context: .
27+
file: ./Dockerfile-8.x
2828
push: ${{ github.ref == 'refs/heads/master' }}
2929
tags: ghcr.io/${{ github.repository }}:8.2-${{ env.VERSION }}
3030
cache-from: type=gha,scope=${{ github.ref_name }}-82 # Cache layers to speed up builds
@@ -50,8 +50,8 @@ jobs:
5050
- run: echo "VERSION=$(cat ./src/xcp_ng_dev/files/version.txt | tr -d '\n')" >> $GITHUB_ENV
5151
- uses: docker/build-push-action@v5 # Using v5 for latest features
5252
with:
53-
context: ./src/xcp_ng_dev/
54-
file: ./src/xcp_ng_dev/files/Dockerfile-8.x
53+
context: .
54+
file: ./Dockerfile-8.x
5555
push: ${{ github.ref == 'refs/heads/master' }}
5656
tags: ghcr.io/${{ github.repository }}:8.3-${{ env.VERSION }}
5757
cache-from: type=gha,scope=${{ github.ref_name }}-83 # Cache layers to speed up builds
@@ -76,8 +76,8 @@ jobs:
7676
# - run: echo "VERSION=$(cat ./src/xcp_ng_dev/files/version.txt | tr -d '\n')" >> $GITHUB_ENV
7777
# - uses: docker/build-push-action@v5 # Using v5 for latest features
7878
# with:
79-
# context: ./src/xcp_ng_dev/
80-
# file: ./src/xcp_ng_dev/files/Dockerfile-9.x
79+
# context: .
80+
# file: ./Dockerfile-9.x
8181
# platforms: |
8282
# linux/amd64/v2
8383
# push: ${{ github.ref == 'refs/heads/master' }}
File renamed without changes.
File renamed without changes.

src/xcp_ng_dev/build.sh renamed to build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,12 @@ ALMA_VERSION=
7171
CENTOS_VERSION=
7272
case "$1" in
7373
9.*)
74-
DOCKERFILE=files/Dockerfile-9.x
74+
DOCKERFILE=Dockerfile-9.x
7575
ALMA_VERSION=10.0
7676
: ${PLATFORM:=linux/amd64/v2}
7777
;;
7878
8.*)
79-
DOCKERFILE=files/Dockerfile-8.x
79+
DOCKERFILE=Dockerfile-8.x
8080
: ${PLATFORM:=linux/amd64}
8181
;;
8282
*)
@@ -85,7 +85,7 @@ case "$1" in
8585
;;
8686
esac
8787

88-
version=`cat ./files/version.txt | tr -d '\n'`
88+
version=`cat ./src/xcp_ng_dev/files/version.txt | tr -d '\n'`
8989

9090
"$RUNNER" build \
9191
--platform "$PLATFORM" \
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)