Merge pull request #46 from xcp-ng/gln/remove-xcpng-dev-env-uxkl

Author: glehmann

.github/workflows/docker.yml

@@ -28,8 +28,8 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }} # Automatically provided by GitHub
       - uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83
         with:
-          context: ./src/xcp_ng_dev/
-          file: ./src/xcp_ng_dev/files/Dockerfile-8.x
+          context: ./container
+          file: ./container/Dockerfile-8.x
           push: ${{ github.ref == 'refs/heads/master' }}
           tags: ghcr.io/${{ github.repository }}:8.2
           cache-from: type=gha,scope=${{ github.ref_name }}-82 # Cache layers to speed up builds
@@ -59,8 +59,8 @@ jobs:
       - run: echo "VERSION=$(cat ./src/xcp_ng_dev/files/protocol-version.txt | tr -d '\n')" >> $GITHUB_ENV
       - uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83
         with:
-          context: ./src/xcp_ng_dev/
-          file: ./src/xcp_ng_dev/files/Dockerfile-8.x
+          context: ./container
+          file: ./container/Dockerfile-8.x
           push: ${{ github.ref == 'refs/heads/master' }}
           tags: ghcr.io/${{ github.repository }}:8.3
           cache-from: type=gha,scope=${{ github.ref_name }}-83 # Cache layers to speed up builds
@@ -88,8 +88,8 @@ jobs:
   #         password: ${{ secrets.GITHUB_TOKEN }} # Automatically provided by GitHub
   #     - uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83
   #       with:
-  #         context: ./src/xcp_ng_dev/
-  #         file: ./src/xcp_ng_dev/files/Dockerfile-9.x
+  #         context: ./container
+  #         file: ./container/Dockerfile-9.x
   #         platforms: |
   #           linux/amd64/v2
   #         push: ${{ github.ref == 'refs/heads/master' }}

src/xcp_ng_dev/files/Dockerfile-8.x renamed to container/Dockerfile-8.x

@@ -71,12 +71,12 @@ ALMA_VERSION=
 CENTOS_VERSION=
 case "$1" in
     9.*)
-        DOCKERFILE=files/Dockerfile-9.x
+        DOCKERFILE=Dockerfile-9.x
         ALMA_VERSION=10.0
         : ${PLATFORM:=linux/amd64/v2}
         ;;
     8.*)
-        DOCKERFILE=files/Dockerfile-8.x
+        DOCKERFILE=Dockerfile-8.x
         : ${PLATFORM:=linux/amd64}
         ;;
     *)