feat: introduce Debian flavor of Docker image, use by default #60

Merged
badPointer merged 2 commits from docker-build-revamp into master 2023-07-23 17:46:27 +00:00
3 changed files with 10 additions and 10 deletions
Showing only changes of commit 0e388bbbda - Show all commits

View file

@ -63,16 +63,16 @@ ncc-docker:
exists:
- Dockerfile
ncc-docker-alpine:
ncc-docker-debian:
image: docker:latest
services:
- docker:dind
before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
script:
- docker build --pull -t "$CI_REGISTRY_IMAGE${tag}-alpine" .
- docker push "$CI_REGISTRY_IMAGE${tag}-alpine"
- docker build --pull -t "$CI_REGISTRY_IMAGE${tag}-debian" .
- docker push "$CI_REGISTRY_IMAGE${tag}-debian"
rules:
- if: $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_BRANCH == 'dev'
exists:
- Dockerfile.alpine
- Dockerfile.debian

View file

@ -44,7 +44,7 @@ RUN git clone https://git.n64.cc/nosial/ncc.git;
# Main stage: Copies downloaded files and installs all
#
FROM php:8.1-fpm
FROM php:8.1-fpm-alpine
# Add extensions
ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
@ -57,8 +57,8 @@ RUN install-php-extensions mbstring \
ctype \
common; \
# Add git
apt install -y git; \
# Add git and tar
apk add git tar; \
# Install phive, phab and ncc; create workdir
chmod +x phive.phar; \

View file

@ -44,7 +44,7 @@ RUN git clone https://git.n64.cc/nosial/ncc.git;
# Main stage: Copies downloaded files and installs all
#
FROM php:8.1-fpm-alpine
FROM php:8.1-fpm
# Add extensions
ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
@ -57,8 +57,8 @@ RUN install-php-extensions mbstring \
ctype \
common; \
# Add git and tar
apk add git tar; \
# Add git
apt install -y git; \
# Install phive, phab and ncc; create workdir
chmod +x phive.phar; \