Fixes [stage]

This commit is contained in:
Christopher Schnick
2024-09-18 09:11:18 +02:00
parent ac87d57f47
commit 93aca677f3
3 changed files with 5 additions and 16 deletions

View File

@@ -1,15 +0,0 @@
name: Docker Build
on:
push:
branches: [ "main" ]
pull_request:
branches: [ "main" ]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Build the Docker image
run: docker build . --file Dockerfile --tag xpipe-webtop:$(date +%s)

View File

@@ -27,6 +27,8 @@ jobs:
echo "XPIPE_VERSION=$XPIPE_VERSION" >> $GITHUB_ENV
XPIPE_REPOSITORY=${{ contains(github.event.head_commit.message, '[release]') == true && 'xpipe-io/xpipe' || 'xpipe-io/xpipe-ptb' }}
echo "XPIPE_REPOSITORY=$XPIPE_REPOSITORY" >> $GITHUB_ENV
XPIPE_PACKAGE=${{ contains(github.event.head_commit.message, '[release]') == true && 'xpipe' || 'xpipe-ptb' }}
echo "XPIPE_PACKAGE=$XPIPE_PACKAGE" >> $GITHUB_ENV
- name: Log in to the Container registry
uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
@@ -56,6 +58,7 @@ jobs:
build-args: |
"XPIPE_VERSION=${{ env.XPIPE_VERSION }}"
"XPIPE_REPOSITORY=${{ env.XPIPE_REPOSITORY }}"
"XPIPE_PACKAGE=${{ env.XPIPE_PACKAGE }}"
- name: Generate artifact attestation
uses: actions/attest-build-provenance@v1
with:

View File

@@ -5,6 +5,7 @@ ARG DEBIAN_FRONTEND="noninteractive"
ENV TITLE="XPipe Webtop"
ARG XPIPE_VERSION
ARG XPIPE_REPOSITORY
ARG XPIPE_PACKAGE
# prevent Ubuntu's firefox stub from being installed
COPY /root/etc/apt/preferences.d/firefox-no-snap /etc/apt/preferences.d/firefox-no-snap
@@ -76,4 +77,4 @@ RUN echo "**** XPipe ****" && \
apt-get install --no-install-recommends -y "./xpipe-installer-linux-x86_64.deb" && \
rm "./xpipe-installer-linux-x86_64.deb"
RUN mkdir -p "/config/.config/kdedefaults/autostart/" && ln -s "/usr/share/applications/xpipe.desktop" "/config/.config/kdedefaults/autostart/xpipe.desktop"
RUN mkdir -p "/config/.config/kdedefaults/autostart/" && ln -s "/usr/share/applications/$XPIPE_PACKAGE.desktop" "/config/.config/kdedefaults/autostart/$XPIPE_PACKAGE.desktop"