Compare commits

...

7 Commits

Author SHA1 Message Date
David Bomba
dbb671eeab Merge pull request #632 from turbo124/debian
Fixes for build stages on different architectures.
2024-11-23 08:44:00 +11:00
David Bomba
baf7b2bff7 Conditional builds for google chrome 2024-11-23 08:43:25 +11:00
David Bomba
db7c7de624 Fixes for trailing backslashes 2024-11-23 08:41:54 +11:00
David Bomba
e8b62de217 Merge pull request #631 from turbo124/debian
Remove alpine build from Debian branch
2024-11-23 08:32:54 +11:00
David Bomba
065a7f94e6 Remove alpine build from Debian branch 2024-11-23 08:32:31 +11:00
David Bomba
47c2ee05b9 Merge pull request #630 from turbo124/debian
Fixes for publish release
2024-11-23 08:30:56 +11:00
David Bomba
adeba71a55 Fixes for publish release 2024-11-23 08:30:31 +11:00
2 changed files with 10 additions and 11 deletions

View File

@@ -11,8 +11,6 @@ jobs:
strategy: strategy:
matrix: matrix:
include: include:
- image: invoiceninja/invoiceninja
context: ./alpine/5/
- image: invoiceninja/invoiceninja-debian - image: invoiceninja/invoiceninja-debian
context: ./debian context: ./debian
@@ -70,7 +68,6 @@ jobs:
builder: ${{ steps.buildx.outputs.name }} builder: ${{ steps.buildx.outputs.name }}
context: ${{ matrix.context }} context: ${{ matrix.context }}
build-args: INVOICENINJA_VERSION=${{ steps.prep.outputs.version }} build-args: INVOICENINJA_VERSION=${{ steps.prep.outputs.version }}
target: prod
platforms: linux/amd64,linux/arm64 platforms: linux/amd64,linux/arm64
push: ${{ github.event_name != 'pull_request' }} push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.prep.outputs.tags }} tags: ${{ steps.prep.outputs.tags }}

10
debian/Dockerfile vendored
View File

@@ -39,10 +39,12 @@ RUN apt-get update && apt-get install -y \
xfonts-wqy \ xfonts-wqy \
wget \ wget \
gnupg2 \ gnupg2 \
&& wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \ && if [ "$(dpkg --print-architecture)" = "amd64" ]; then \
&& echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list \ wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
&& apt-get update \ && echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list \
&& apt-get install -y google-chrome-stable \ && apt-get update \
&& apt-get install -y google-chrome-stable; \
fi \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*