dannc/coverage-merger
1
0
Fork 0
mirror of https://github.com/Dannecron/coverage-merger.git synced 2025-12-25 15:52:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

ci: do not use variable inside copy --from

Browse Source
This commit is contained in:
dannc
2023-10-10 11:08:35 +07:00
parent 3debe8ed1a
commit 6c94c20e30
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/Dockerfile vendored
View File

@@ -1,9 +1,11 @@
ARG PHP_VERSION=8.2.11 ARG PHP_VERSION=8.2.11
ARG COMPOSER_VERSION=2.6.5 ARG COMPOSER_VERSION=2.6.5
FROM php:${PHP_VERSION}-cli-alpine FROM composer:${COMPOSER_VERSION} as composer
COPY --from=composer:${COMPOSER_VERSION} /usr/bin/composer /usr/bin/composer FROM php:${PHP_VERSION}-cli-alpine as runtime
COPY --from=composer /usr/bin/composer /usr/bin/composer
WORKDIR /app WORKDIR /app

22
.github/workflows/ci.yml vendored
View File

@@ -63,11 +63,12 @@ jobs:
- name: Build docker image - name: Build docker image
run: | run: |
DOCKER_BUILDKIT=1 docker build \ DOCKER_BUILDKIT=1 docker build \
--build-arg BUILDKIT_INLINE_CACHE=1 \ --build-arg BUILDKIT_INLINE_CACHE=1 \
--build-arg PHP_VERSION=${{ vars.DOCKER_RUNTIME_PHP_VERSION }} \ --build-arg PHP_VERSION=${{ vars.DOCKER_RUNTIME_PHP_VERSION }} \
--build-arg COMPOSER_VERSION=${{ vars.DOCKER_RUNTIME_COMPOSER_VERSION }} \ --build-arg COMPOSER_VERSION=${{ vars.DOCKER_RUNTIME_COMPOSER_VERSION }} \
--tag=dannecron/coverage-merger:latest \ --target=runtime \
--file=./.github/Dockerfile . --tag=dannecron/coverage-merger:latest \
--file=./.github/Dockerfile .
- name: Login to docker hub - name: Login to docker hub
uses: actions-hub/docker/login@master uses: actions-hub/docker/login@master
env: env:
@@ -91,11 +92,12 @@ jobs:
- name: Build docker image - name: Build docker image
run: | run: |
DOCKER_BUILDKIT=1 docker build \ DOCKER_BUILDKIT=1 docker build \
--build-arg BUILDKIT_INLINE_CACHE=1 \ --build-arg BUILDKIT_INLINE_CACHE=1 \
--build-arg PHP_VERSION=${{ vars.DOCKER_RUNTIME_PHP_VERSION }} \ --build-arg PHP_VERSION=${{ vars.DOCKER_RUNTIME_PHP_VERSION }} \
--build-arg COMPOSER_VERSION=${{ vars.DOCKER_RUNTIME_COMPOSER_VERSION }} \ --build-arg COMPOSER_VERSION=${{ vars.DOCKER_RUNTIME_COMPOSER_VERSION }} \
--tag=dannecron/coverage-merger:latest \ --target=runtime
--file=./.github/Dockerfile . --tag=dannecron/coverage-merger:latest \
--file=./.github/Dockerfile .
- name: Login to docker hub - name: Login to docker hub
uses: actions-hub/docker/login@master uses: actions-hub/docker/login@master
env: env: