add second build job to docker workflow

facebookincubator · Mar 11, 2024 · 49ff7ab · 49ff7ab
1 parent 9b32c5c
commit 49ff7ab
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 9 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -48,18 +48,49 @@ jobs:
             file: "scripts/check-container.dockfile"
             args: "cpu_target=avx"
             tags: "ghcr.io/facebookincubator/velox-dev:check-avx"
-          - name: CircleCI
-            file: "scripts/circleci-container.dockfile"
+          - name: Centos 8
+            file: "scripts/centos.dockerfile"
             args: "cpu_target=avx"
-            tags: "ghcr.io/facebookincubator/velox-dev:circleci-avx"
-          - name: Torcharrow
-            file: "scripts/velox-torcharrow-container.dockfile"
-            args: "cpu_target=avx"
-            tags: "ghcr.io/facebookincubator/velox-dev:torcharrow-avx"
+            tags: "ghcr.io/facebookincubator/velox-dev:centos8"
           - name: Dev
             file: "scripts/ubuntu-22.04-cpp.dockerfile"
             args: ""
             tags: "ghcr.io/facebookincubator/velox-dev:amd64-ubuntu-22.04-avx"
+
+    steps:
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Build and Push
+        uses: docker/build-push-action@v3
+        with:
+          file: "${{ matrix.file }}"
+          build-args: "${{ matrix.args }}"
+          push: ${{ github.repository == 'facebookincubator/velox' && github.event_name != 'pull_request'}}
+          tags: "${{ matrix.tags }}"
+
+  linux-needs:
+    name: "Build and Push ${{ matrix.name }}"
+    needs: linux
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: Centos 8
+            file: "scripts/adapters.dockerfile"
+            args: "cpu_target=avx"
+            tags: "ghcr.io/facebookincubator/velox-dev:adapters"
           - name: Presto Java
             file: "scripts/prestojava-container.dockerfile"
             args: "PRESTO_VERSION=0.284"

diff --git a/scripts/prestojava-container.dockerfile b/scripts/prestojava-container.dockerfile
@@ -13,12 +13,11 @@
 # limitations under the License.
 # Build the test and build container for presto_cpp
 #
-FROM quay.io/centos/centos:stream8
+FROM ghcr.io/facebookincubator/velox-dev:centos8 
 
 ARG PRESTO_VERSION
 
 ADD scripts /velox/scripts/
-RUN /velox/scripts/setup-centos8.sh
 RUN wget https://repo1.maven.org/maven2/com/facebook/presto/presto-server/${PRESTO_VERSION}/presto-server-${PRESTO_VERSION}.tar.gz
 RUN wget https://repo1.maven.org/maven2/com/facebook/presto/presto-cli/${PRESTO_VERSION}/presto-cli-${PRESTO_VERSION}-executable.jar