1
0
mirror of https://github.com/pravets/oscript-images.git synced 2025-11-25 22:32:37 +02:00

fix: и ещё фикс сборки

This commit is contained in:
Iosif Pravets
2025-07-22 14:36:32 +00:00
committed by GitHub
parent b15c48275c
commit ffe78bf873
3 changed files with 4 additions and 1 deletions

View File

@@ -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: |

View File

@@ -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}

View File

@@ -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 <i@pravets.ru>"
RUN opm i yard