This is an automated email from the ASF dual-hosted git repository.
gongchao pushed a commit to branch action-docker-build
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
The following commit(s) were added to refs/heads/action-docker-build by this
push:
new 8ac9d0c1a bugfix github action build docker image error
8ac9d0c1a is described below
commit 8ac9d0c1a7ba06f6a8c06bc11b06b39ee580f5f2
Author: tomsun28 <[email protected]>
AuthorDate: Wed Aug 14 14:18:16 2024 +0800
bugfix github action build docker image error
Signed-off-by: tomsun28 <[email protected]>
---
.github/workflows/nightly-build.yml | 13 +++++++++++--
script/docker/collector/Dockerfile | 6 ++----
script/docker/collector/build.sh | 12 ++++++------
script/docker/server/build.sh | 12 ++++++------
4 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/.github/workflows/nightly-build.yml
b/.github/workflows/nightly-build.yml
index 56df5692e..1360d483c 100644
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -34,8 +34,17 @@ jobs:
uses: actions/setup-java@v1
with:
java-version: 17
- - name: Build with Maven
- run: mvn clean -B package -Prelease --file pom.xml
+
+ - name: Build the Frontend
+ run: |
+ cd web-app
+ yarn package
+
+ - name: Build the Backend
+ run: |
+ mvn clean package -Prelease
+ cd collector
+ mvn clean package -Pcluster -DskipTests
- uses: docker/setup-qemu-action@v3
- uses: docker/setup-buildx-action@v3
diff --git a/script/docker/collector/Dockerfile
b/script/docker/collector/Dockerfile
index ff075dc72..f5a76f173 100644
--- a/script/docker/collector/Dockerfile
+++ b/script/docker/collector/Dockerfile
@@ -17,19 +17,17 @@
FROM openjdk:17-slim-buster
-ARG VERSION
-
MAINTAINER Apache HertzBeat "[email protected]"
# Install SSH
RUN apt-get update && apt-get install -y openssh-server
RUN mkdir /var/run/sshd
-ADD apache-hertzbeat-collector-${VERSION}-incubating-bin.tar.gz /opt/
+ADD apache-hertzbeat-collector-*-incubating-bin.tar.gz /opt/
ENV TZ=Asia/Shanghai
ENV LANG=en_US.UTF-8
-WORKDIR /opt/apache-hertzbeat-collector-${VERSION}-incubating-bin/
+WORKDIR /opt/apache-hertzbeat-collector-*-incubating-bin/
ENTRYPOINT ["./bin/entrypoint.sh"]
diff --git a/script/docker/collector/build.sh b/script/docker/collector/build.sh
index d5a4515a5..9bef73f59 100644
--- a/script/docker/collector/build.sh
+++ b/script/docker/collector/build.sh
@@ -31,20 +31,20 @@ fi
# docker compile context
CONTEXT_DIR=`pwd`
-COMMAND="docker buildx build --platform linux/arm64,linux/amd64 -t
apache/hertzbeat-collector:v$VERSION -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR
--build-arg VERSION="$VERSION" --push"
+COMMAND="docker buildx build --platform linux/arm64,linux/amd64 -t
apache/hertzbeat-collector:v$VERSION -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR
--push"
-#COMMAND="docker buildx build --platform linux/arm64,linux/amd64 -t
apache/hertzbeat-collector:latest -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR
--build-arg VERSION="$VERSION" --push"
+#COMMAND="docker buildx build --platform linux/arm64,linux/amd64 -t
apache/hertzbeat-collector:latest -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR
--push"
-#COMMAND="docker buildx build --platform linux/arm64,linux/amd64 -t
quay.io/tancloud/hertzbeat-collector:v$VERSION -f $CURRENT_DIR/Dockerfile
$CONTEXT_DIR --build-arg VERSION="$VERSION" --push"
+#COMMAND="docker buildx build --platform linux/arm64,linux/amd64 -t
quay.io/tancloud/hertzbeat-collector:v$VERSION -f $CURRENT_DIR/Dockerfile
$CONTEXT_DIR --push"
-#COMMAND="docker buildx build --platform linux/arm64,linux/amd64 -t
quay.io/tancloud/hertzbeat-collector:latest -f $CURRENT_DIR/Dockerfile
$CONTEXT_DIR --build-arg VERSION="$VERSION" --push"
+#COMMAND="docker buildx build --platform linux/arm64,linux/amd64 -t
quay.io/tancloud/hertzbeat-collector:latest -f $CURRENT_DIR/Dockerfile
$CONTEXT_DIR --push"
# Build Local
-#COMMAND="docker build -t apache/hertzbeat-collector:latest -f
$CURRENT_DIR/Dockerfile $CONTEXT_DIR --build-arg VERSION="$VERSION""
+#COMMAND="docker build -t apache/hertzbeat-collector:latest -f
$CURRENT_DIR/Dockerfile $CONTEXT_DIR "
echo "$COMMAND"
$COMMAND
-#docker build -t apache/hertzbeat-collector:latest -f $CURRENT_DIR/Dockerfile
$CONTEXT_DIR --build-arg VERSION="$VERSION"
+#docker build -t apache/hertzbeat-collector:latest -f $CURRENT_DIR/Dockerfile
$CONTEXT_DIR
diff --git a/script/docker/server/build.sh b/script/docker/server/build.sh
index eddf16b47..842b8eeb7 100755
--- a/script/docker/server/build.sh
+++ b/script/docker/server/build.sh
@@ -27,17 +27,17 @@ VERSION=`ls
apache-hertzbeat-*-incubating-docker-compose.tar.gz| awk -F"-" '{pri
# compile context dir
CONTEXT_DIR=`pwd`
-COMMAND="docker buildx build --platform
${IMAGE_PLATFORM:-linux/arm64,linux/amd64} -t apache/hertzbeat:v$VERSION -f
$CURRENT_DIR/Dockerfile $CONTEXT_DIR --build-arg --push=${IMAGE_PUSH:-true}
--load=${IMAGE_LOAD:-false}"
+COMMAND="docker buildx build --platform
${IMAGE_PLATFORM:-linux/arm64,linux/amd64} -t apache/hertzbeat:v$VERSION -f
$CURRENT_DIR/Dockerfile $CONTEXT_DIR --push=${IMAGE_PUSH:-true}
--load=${IMAGE_LOAD:-false}"
-#COMMAND="docker buildx build --platform linux/arm64,linux/amd64 -t
apache/hertzbeat:latest -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR --build-arg
--push"
+#COMMAND="docker buildx build --platform linux/arm64,linux/amd64 -t
apache/hertzbeat:latest -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR --push"
-#COMMAND="docker buildx build --platform linux/arm64,linux/amd64 -t
quay.io/tancloud/hertzbeat:v$VERSION -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR
--build-arg --push"
+#COMMAND="docker buildx build --platform linux/arm64,linux/amd64 -t
quay.io/tancloud/hertzbeat:v$VERSION -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR
--push"
-#COMMAND="docker buildx build --platform linux/arm64,linux/amd64 -t
quay.io/tancloud/hertzbeat:latest -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR
--build-arg --push"
+#COMMAND="docker buildx build --platform linux/arm64,linux/amd64 -t
quay.io/tancloud/hertzbeat:latest -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR
--push"
# Build Local
-#COMMAND="docker build -t apache/hertzbeat:latest -f $CURRENT_DIR/Dockerfile
$CONTEXT_DIR --build-arg "
+#COMMAND="docker build -t apache/hertzbeat:latest -f $CURRENT_DIR/Dockerfile
$CONTEXT_DIR "
echo "$COMMAND"
@@ -49,4 +49,4 @@ echo "$COMMAND"
$COMMAND
-#docker build -t apache/hertzbeat:latest -f $CURRENT_DIR/Dockerfile
$CONTEXT_DIR --build-arg
+#docker build -t apache/hertzbeat:latest -f $CURRENT_DIR/Dockerfile
$CONTEXT_DIR
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
