Преглед на файлове

Merge pull request #15858 from richardkchapman/lnb3

HPCC-27043 Github action for LN builds

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman преди 3 години
родител
ревизия
87f178a195
променени са 2 файла, в които са добавени 3 реда и са изтрити 1 реда
  1. 1 0
      dockerfiles/buildall-common.sh
  2. 2 1
      dockerfiles/platform-core-ln/Dockerfile

+ 1 - 0
dockerfiles/buildall-common.sh

@@ -86,6 +86,7 @@ build_image() {
     docker image build -t ${DEST_DOCKER_REGISTRY}/${DEST_DOCKER_REPO}/${name}:${label} \
     docker image build -t ${DEST_DOCKER_REGISTRY}/${DEST_DOCKER_REPO}/${name}:${label} \
        --build-arg BASE_VER=${BASE_VER} \
        --build-arg BASE_VER=${BASE_VER} \
        --build-arg DOCKER_REPO=${DOCKER_REPO} \
        --build-arg DOCKER_REPO=${DOCKER_REPO} \
+       --build-arg DEST_DOCKER_REPO=${DEST_DOCKER_REPO} \
        --build-arg BUILD_TAG=${buildTag} \
        --build-arg BUILD_TAG=${buildTag} \
        --build-arg BUILD_LABEL=${BUILD_LABEL} \
        --build-arg BUILD_LABEL=${BUILD_LABEL} \
        --build-arg BUILD_USER=${BUILD_USER} \
        --build-arg BUILD_USER=${BUILD_USER} \

+ 2 - 1
dockerfiles/platform-core-ln/Dockerfile

@@ -19,7 +19,8 @@
 
 
 ARG BUILD_LABEL
 ARG BUILD_LABEL
 ARG DOCKER_REPO
 ARG DOCKER_REPO
-FROM ${DOCKER_REPO}/platform-build-ln:${BUILD_LABEL} as plugins
+ARG DEST_DOCKER_REPO
+FROM ${DEST_DOCKER_REPO}/platform-build-ln:${BUILD_LABEL} as plugins
 FROM ${DOCKER_REPO}/platform-core:${BUILD_LABEL}
 FROM ${DOCKER_REPO}/platform-core:${BUILD_LABEL}
 ENV DEBIAN_FRONTEND=noninteractive
 ENV DEBIAN_FRONTEND=noninteractive