Skip to content

Commit

Permalink
remove regex check
Browse files Browse the repository at this point in the history
  • Loading branch information
andygrove committed Aug 19, 2024
1 parent 2c52741 commit 073d202
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
13 changes: 5 additions & 8 deletions .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,12 @@ docker:
- uses: actions/checkout@v3
- name: Build and push Docker image
run: |
docker build -t datafusion-comet:latest -f kube/Dockerfile .
docker build -t datafusion-comet:spark-3.4-latest -f kube/Dockerfile .
export DOCKER_TAG="$(git describe --exact-match --tags $(git log -n1 --pretty='%h') || echo '')"
if [[ $DOCKER_TAG =~ ^[0-9\.]+-rc[0-9]+$ ]]
then
echo "publishing docker tag $DOCKER_TAG"
docker tag datafusion-comet:latest ghcr.io/apache/datafusion-comet:$DOCKER_TAG
docker login ghcr.io -u $DOCKER_USER -p "$DOCKER_PASS"
docker push ghcr.io/apache/datafusion-comet:$DOCKER_TAG
fi
echo "publishing docker tag $DOCKER_TAG"
docker tag datafusion-comet:spark-3.4-latest ghcr.io/apache/datafusion-comet:$DOCKER_TAG
docker login ghcr.io -u $DOCKER_USER -p "$DOCKER_PASS"
docker push ghcr.io/apache/datafusion-comet:$DOCKER_TAG
env:
DOCKER_USER: ${{ github.actor }}
DOCKER_PASS: ${{ secrets.GITHUB_TOKEN }}
4 changes: 3 additions & 1 deletion kube/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ ENV SCALA_VERSION=2.12

# Add source files to Docker image
RUN mkdir /comet
WORKDIR /comet

ADD .mvn /comet
ADD common /comet
ADD fuzz-testing /comet
Expand All @@ -44,7 +46,7 @@ ADD Makefile /comet
ADD pom.xml /comet

# Pick the JDK instead of JRE to compile Comet
RUN JAVA_HOME=$(readlink -f $(which javac) | sed "s/\/bin\/javac//") make release PROFILES="-Pspark-$SPARK_VERSION -Pscala-$SCALA_VERSION"
RUN JAVA_HOME=$(readlink -f $(which javac) | sed "s/\/bin\/javac//") make release-nogit PROFILES="-Pspark-$SPARK_VERSION -Pscala-$SCALA_VERSION"

FROM apache/spark:3.4.2
ENV SPARK_VERSION=3.4
Expand Down

0 comments on commit 073d202

Please sign in to comment.