Update CI now that alpine has been merged into master
This commit is contained in:
parent
3056a63348
commit
cd26c07099
@ -5,8 +5,8 @@ stages:
|
||||
- build-manifest-test
|
||||
|
||||
variables:
|
||||
BRANCH: alpine
|
||||
VERSION: 8.1-fpm-${BRANCH}
|
||||
BRANCH: master
|
||||
VERSION: 8.1-fpm
|
||||
DOCKER_HOST: tcp://docker:2375
|
||||
VERSIONARCH: ${VERSION}-${ARCH}
|
||||
|
||||
|
@ -13,7 +13,7 @@ arm64:build:
|
||||
- docker
|
||||
- arm64
|
||||
only:
|
||||
- alpine
|
||||
- master
|
||||
|
||||
#arm64:build-test:
|
||||
# variables:
|
||||
@ -26,4 +26,4 @@ arm64:build:
|
||||
# - docker
|
||||
# - arm64
|
||||
# only:
|
||||
# - alpine
|
||||
# - master
|
||||
|
@ -13,7 +13,7 @@ armv7l:build:
|
||||
- docker
|
||||
- armv7l
|
||||
only:
|
||||
- alpine
|
||||
- master
|
||||
|
||||
#armv7l:build-test:
|
||||
# variables:
|
||||
@ -26,4 +26,4 @@ armv7l:build:
|
||||
# - docker
|
||||
# - armv7l
|
||||
# only:
|
||||
# - alpine
|
||||
# - master
|
||||
|
@ -11,7 +11,7 @@ x86_64:build-manifest:
|
||||
- docker
|
||||
- x86_64
|
||||
only:
|
||||
- alpine
|
||||
- master
|
||||
|
||||
x86_64:build-manifest-test:
|
||||
stage: build-manifest-test
|
||||
@ -22,4 +22,4 @@ x86_64:build-manifest-test:
|
||||
- docker
|
||||
- x86_64
|
||||
only:
|
||||
- alpine
|
||||
- master
|
||||
|
@ -13,7 +13,7 @@ x86_64:build:
|
||||
- docker
|
||||
- x86_64
|
||||
only:
|
||||
- alpine
|
||||
- master
|
||||
|
||||
x86_64:build-test:
|
||||
variables:
|
||||
@ -26,4 +26,4 @@ x86_64:build-test:
|
||||
- docker
|
||||
- x86_64
|
||||
only:
|
||||
- alpine
|
||||
- master
|
||||
|
@ -1,7 +1,7 @@
|
||||
# NAME leenooks/php
|
||||
# VERSION 8.1-fpm-alpine-test
|
||||
# VERSION 8.1-fpm-test
|
||||
|
||||
FROM registry.dege.au/leenooks/php:8.1-fpm-alpine
|
||||
FROM registry.dege.au/leenooks/php:8.1-fpm
|
||||
|
||||
# Add other built tools
|
||||
RUN apk --no-cache add npm linux-headers \
|
||||
|
Loading…
Reference in New Issue
Block a user