Nosial/ncc
2
0
Fork 0
Code Issues 1 Pull requests Projects Releases 11 Packages Wiki Activity Actions

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
Conversation 6 Commits 2 Files changed 2 +10 -10
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 0e388bbbda - Show all commits

8
.gitlab-ci.yml
View file

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

6
Dockerfile
View file

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

6
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 # Main stage: Copies downloaded files and installs all
# #
FROM php:8.1-fpm-alpine FROM php:8.1-fpm
# Add extensions # Add extensions
ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/ 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 \ ctype \
common; \ common; \
# Add git and tar # Add git
apk add git tar; \ apt install -y git; \
# Install phive, phab and ncc; create workdir # Install phive, phab and ncc; create workdir
chmod +x phive.phar; \ chmod +x phive.phar; \