REST: Refactor docker image files

apache · Nov 29, 2024 · 0a0deb1 · 0a0deb1
1 parent 7c7b4ba
commit 0a0deb1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/publish-docker.yml → ...s/publish-iceberg-rest-fixture-docker.yml b/.github/workflows/publish-docker.yml → ...s/publish-iceberg-rest-fixture-docker.yml
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-name: Build and Push Docker Image
+name: Build and Push 'iceberg-rest-fixture' Docker Image
 
 on:
   push:
@@ -28,6 +28,7 @@ on:
 env:
   DOCKER_IMAGE_TAG: iceberg-rest-fixture
   DOCKER_IMAGE_VERSION: latest
+  DOCKER_REPOSITORY: apache
 
 jobs:
   build:
@@ -44,12 +45,12 @@ jobs:
       run: |
         docker login -u ${{ secrets.DOCKERHUB_USER }} -p ${{ secrets.DOCKERHUB_TOKEN }}
     - name: Set the tagged version
-      # for tag 'apache-iceberg-1.7.0', publish image 'apache/iceberg-rest-fixture:1.7.1'
+      # for tag 'apache-iceberg-1.7.1', publish image 'apache/iceberg-rest-fixture:1.7.1'
       if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
       run: |
         echo "DOCKER_IMAGE_VERSION=`echo ${{ github.ref }} | tr -d -c 0-9.`" >> "$GITHUB_ENV"
     - name: Build Docker Image
-      run: docker build -t ${{ secrets.DOCKERHUB_USER }}/$DOCKER_IMAGE_TAG:$DOCKER_IMAGE_VERSION -f docker/iceberg-rest-adapter-image/Dockerfile .
+      run: docker build -t $DOCKER_REPOSITORY/$DOCKER_IMAGE_TAG:$DOCKER_IMAGE_VERSION -f docker/iceberg-rest-fixture/Dockerfile .
     - name: Push Docker Image
       run: |
-        docker push ${{ secrets.DOCKERHUB_USER }}/$DOCKER_IMAGE_TAG:$DOCKER_IMAGE_VERSION
+        docker push $DOCKER_REPOSITORY/$DOCKER_IMAGE_TAG:$DOCKER_IMAGE_VERSION
diff --git a/docker/iceberg-rest-adapter-image/Dockerfile → docker/iceberg-rest-fixture/Dockerfile b/docker/iceberg-rest-adapter-image/Dockerfile → docker/iceberg-rest-fixture/Dockerfile
diff --git a/docker/iceberg-rest-adapter-image/README.md → docker/iceberg-rest-fixture/README.md b/docker/iceberg-rest-adapter-image/README.md → docker/iceberg-rest-fixture/README.md
@@ -32,7 +32,7 @@ When making changes to the local files and test them out, you can build the imag
 ./gradlew :iceberg-open-api:shadowJar
 
 # Rebuild the docker image
-docker image rm -f apache/iceberg-rest-adapter && docker build -t apache/iceberg-rest-adapter -f docker/iceberg-rest-adapter-image/Dockerfile .
+docker image rm -f apache/iceberg-rest-adapter && docker build -t apache/iceberg-rest-adapter -f docker/iceberg-rest-fixture/Dockerfile .
 ```
 
 ## Browse