diff --git a/.github/workflows/build-yard.yml b/.github/workflows/build-yard.yml index e6b4ae1..16913fa 100644 --- a/.github/workflows/build-yard.yml +++ b/.github/workflows/build-yard.yml @@ -29,6 +29,7 @@ jobs: - name: Set environment variables run: | echo "DOCKER_REGISTRY_URL=${{ secrets.DOCKER_REGISTRY_URL }}" >> "$GITHUB_ENV" + echo "DOCKER_REGISTRY_URL=${{ secrets.DOCKER_LOGIN }}" >> "$GITHUB_ENV" - name: Build and Push Docker image run: | diff --git a/src/build-yard.sh b/src/build-yard.sh index 6c26b45..9d92f6d 100755 --- a/src/build-yard.sh +++ b/src/build-yard.sh @@ -28,6 +28,7 @@ docker build \ --pull \ --build-arg YARD_VERSION="${yard_version}" \ --build-arg DOCKER_REGISTRY_URL="${DOCKER_REGISTRY_URL}" \ + --build-arg DOCKER_LOGIN="${DOCKER_LOGIN}" \ -t "${DOCKER_REGISTRY_URL}/${DOCKER_LOGIN}/yard:${yard_version}" \ -f "${SCRIPT_DIR}/yard/Dockerfile" \ ${last_arg} diff --git a/src/yard/Dockerfile b/src/yard/Dockerfile index 5c44e34..3d5eae4 100644 --- a/src/yard/Dockerfile +++ b/src/yard/Dockerfile @@ -1,8 +1,9 @@ ARG DOCKER_REGISTRY_URL +ARG DOCKER_LOGIN ARG BASE_IMAGE=oscript ARG BASE_TAG=dev -FROM ${DOCKER_REGISTRY_URL}/${BASE_IMAGE}:${BASE_TAG} +FROM ${DOCKER_REGISTRY_URL}/${DOCKER_LOGIN}/${BASE_IMAGE}:${BASE_TAG} LABEL maintainer="Iosif Pravets " RUN opm i yard