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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/build-yard.yml vendored
View File

@@ -29,6 +29,7 @@ jobs:
- name: Set environment variables - name: Set environment variables
run: | run: |
echo "DOCKER_REGISTRY_URL=${{ secrets.DOCKER_REGISTRY_URL }}" >> "$GITHUB_ENV" 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 - name: Build and Push Docker image
run: | run: |

1
src/build-yard.sh
View File

@@ -28,6 +28,7 @@ docker build \
--pull \ --pull \
--build-arg YARD_VERSION="${yard_version}" \ --build-arg YARD_VERSION="${yard_version}" \
--build-arg DOCKER_REGISTRY_URL="${DOCKER_REGISTRY_URL}" \ --build-arg DOCKER_REGISTRY_URL="${DOCKER_REGISTRY_URL}" \
--build-arg DOCKER_LOGIN="${DOCKER_LOGIN}" \
-t "${DOCKER_REGISTRY_URL}/${DOCKER_LOGIN}/yard:${yard_version}" \ -t "${DOCKER_REGISTRY_URL}/${DOCKER_LOGIN}/yard:${yard_version}" \
-f "${SCRIPT_DIR}/yard/Dockerfile" \ -f "${SCRIPT_DIR}/yard/Dockerfile" \
${last_arg} ${last_arg}

3
src/yard/Dockerfile
View File

@@ -1,8 +1,9 @@
ARG DOCKER_REGISTRY_URL ARG DOCKER_REGISTRY_URL
ARG DOCKER_LOGIN
ARG BASE_IMAGE=oscript ARG BASE_IMAGE=oscript
ARG BASE_TAG=dev 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>" LABEL maintainer="Iosif Pravets <i@pravets.ru>"
RUN opm i yard RUN opm i yard