Build with composer included.

This commit is contained in:
Greyscale 2022-08-28 13:18:57 +02:00
parent 22a2462792
commit 456c5936cb
No known key found for this signature in database
GPG key ID: 74BAFF55434DA4B2
5 changed files with 21 additions and 20 deletions

View file

@ -26,15 +26,6 @@ jobs:
uses: docker/setup-qemu-action@v1 uses: docker/setup-qemu-action@v1
- name: Set up Docker Buildx - name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2 uses: docker/setup-buildx-action@v2
- name: Cache Composer dependencies
uses: actions/cache@v2
with:
path: /tmp/composer-cache
key: ${{ runner.os }}-${{ hashFiles('**/composer.lock') }}
- uses: php-actions/composer@v6
with:
php_version: 8.1
args: --ignore-platform-reqs
- name: Bake - name: Bake
uses: docker/bake-action@v2.1.0 uses: docker/bake-action@v2.1.0
with: with:

View file

@ -10,6 +10,7 @@ RUN echo "APT::Acquire::Retries \"5\";" > /etc/apt/apt.conf.d/80-retries && \
apt-get -qq update && \ apt-get -qq update && \
apt-get -yqq upgrade && \ apt-get -yqq upgrade && \
apt-get -yqq install --no-install-recommends \ apt-get -yqq install --no-install-recommends \
curl \
xz-utils \ xz-utils \
dos2unix \ dos2unix \
runit \ runit \
@ -39,14 +40,15 @@ RUN echo "APT::Acquire::Retries \"5\";" > /etc/apt/apt.conf.d/80-retries && \
apt-get autoremove -yqq && \ apt-get autoremove -yqq && \
apt-get clean && \ apt-get clean && \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /var/lib/dpkg/status.old /var/cache/debconf/templates.dat /var/log/dpkg.log /var/log/lastlog /var/log/apt/*.log rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /var/lib/dpkg/status.old /var/cache/debconf/templates.dat /var/log/dpkg.log /var/log/lastlog /var/log/apt/*.log
RUN curl https://getcomposer.org/composer-stable.phar --output /usr/local/bin/composer && \
chmod +x /usr/local/bin/composer
COPY start.sh /usr/local/bin/start.sh COPY start.sh /usr/local/bin/start.sh
COPY mysql.runit /etc/service/mysql/run COPY mysql.runit /etc/service/mysql/run
COPY sync-pull.runit /etc/service/sync-pull/run COPY sync-pull.runit /etc/service/sync-pull/run
COPY sync-push.runit /etc/service/sync-push/run COPY sync-push.runit /etc/service/sync-push/run
VOLUME /dumps VOLUME /dumps
WORKDIR /sync WORKDIR /sync
COPY vendor /sync/vendor COPY composer.* /sync/
COPY syncer /sync/syncer COPY syncer /sync/syncer
COPY sync /sync/sync COPY sync /sync/sync
COPY start.sh /sync/start.sh COPY start.sh /sync/start.sh

View file

@ -9,7 +9,8 @@ RUN apk add --no-cache runit && \
libavif \ libavif \
&& \ && \
apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted gnu-libiconv \ apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted gnu-libiconv \
# Packages # Packages \
curl \
tini \ tini \
php81 \ php81 \
php81-dev \ php81-dev \
@ -42,14 +43,16 @@ RUN apk add --no-cache runit && \
php81-pecl-apcu \ php81-pecl-apcu \
ncurses \ ncurses \
xz \ xz \
&& ln -s /usr/bin/php81 /usr/bin/php && ln -s /usr/bin/php81 /usr/bin/php \
RUN curl https://getcomposer.org/composer-stable.phar --output /usr/local/bin/composer && \
chmod +x /usr/local/bin/composer
COPY start.sh /usr/local/bin/start.sh COPY start.sh /usr/local/bin/start.sh
COPY postgres.runit /etc/service/postgres/run COPY postgres.runit /etc/service/postgres/run
COPY sync-pull.runit /etc/service/sync-pull/run COPY sync-pull.runit /etc/service/sync-pull/run
COPY sync-push.runit /etc/service/sync-push/run COPY sync-push.runit /etc/service/sync-push/run
VOLUME /dumps VOLUME /dumps
WORKDIR /sync WORKDIR /sync
COPY vendor /sync/vendor COPY composer.* /sync
COPY syncer /sync/syncer COPY syncer /sync/syncer
COPY sync /sync/sync COPY sync /sync/sync
COPY start.sh /sync/start.sh COPY start.sh /sync/start.sh

View file

@ -1,10 +1,10 @@
group "default" { group "default" {
targets = [ targets = [
#"postgres-14", "postgres-14",
#"postgres-13", "postgres-13",
#"postgres-12", "postgres-12",
#"postgres-11", "postgres-11",
#"postgres-10", "postgres-10",
"mariadb-10-9", "mariadb-10-9",
#"mariadb-10-8", #"mariadb-10-8",
#"mariadb-10-7", #"mariadb-10-7",

View file

@ -31,5 +31,10 @@
"name": "Matthew Baggett", "name": "Matthew Baggett",
"email": "matthew@baggett.me" "email": "matthew@baggett.me"
} }
] ],
"config": {
"preferred-install": {
"*": "dist"
}
}
} }