michael/containerdesk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

disabling arm64 for now

Browse source
This commit is contained in:
Michael Trip 2023-10-03 19:37:38 +02:00
parent 5b9073c7e6
commit f69816e248
5 changed files with 11 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.github/workflows/fedora-mate-build.yml vendored
View file

@ -69,8 +69,7 @@ jobs:
with: with:
context: ./mate context: ./mate
file: ./mate/Dockerfile file: ./mate/Dockerfile
# platforms: linux/amd64,linux/arm64 platforms: linux/amd64
platforms: linux/amd64,linux/arm64
push: ${{ github.event_name != 'pull_request' }} push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }} tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }} labels: ${{ steps.meta.outputs.labels }}

3
.github/workflows/fedora-xfce-build.yml vendored
View file

@ -119,8 +119,7 @@ jobs:
with: with:
context: ./xfce context: ./xfce
file: ./xfce/Dockerfile file: ./xfce/Dockerfile
# platforms: linux/amd64,linux/arm64 platforms: linux/amd64
platforms: linux/arm64
push: ${{ github.event_name != 'pull_request' }} push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }} tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }} labels: ${{ steps.meta.outputs.labels }}

1
.github/workflows/ubuntu-mate-build.yml vendored
View file

@ -69,7 +69,6 @@ jobs:
with: with:
context: ./ubuntu-mate context: ./ubuntu-mate
file: ./ubuntu-mate/Dockerfile file: ./ubuntu-mate/Dockerfile
# platforms: linux/amd64,linux/arm64
platforms: linux/amd64 platforms: linux/amd64
push: ${{ github.event_name != 'pull_request' }} push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }} tags: ${{ steps.meta.outputs.tags }}

18
mate/Dockerfile
View file

@ -4,21 +4,19 @@ FROM docker.io/linuxserver/rdesktop:fedora-mate
ARG BUILD_DATE ARG BUILD_DATE
ARG VERSION ARG VERSION
ARG BUILDARCH ARG BUILDARCH
ARG TARGETARCH
LABEL build_version="based on Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL build_version="based on Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="Michael Trip" LABEL maintainer="Michael Trip"
WORKDIR /tmp WORKDIR /tmp
RUN \ RUN dnf install -y wget && \
dnf install -y wget && \ case ${TARGETARCH} in \
if [ "$BUILDARCH" = "amd64" ]; then \ "amd64") DOWNLOAD_ARCH=amd64 ;; \
wget -O /tmp/openlens.rpm https://github.com/MuhammedKalkan/OpenLens/releases/download/v6.5.2-366/OpenLens-6.5.2-366.x86_64.rpm; \ "arm64") DOWNLOAD_ARCH=aarch64 ;; \
elif [ "$BUILDARCH" = "arm64" ]; then \ esac \
wget -O /tmp/openlens.rpm https://github.com/MuhammedKalkan/OpenLens/releases/download/v6.5.2-366/OpenLens-6.5.2-366.aarch64.rpm; \ && wget -O /tmp/openlens.rpm https://github.com/MuhammedKalkan/OpenLens/releases/download/v6.5.2-366/OpenLens-6.5.2-366.${DOWNLOAD_ARCH}.rpm
else \
echo "Unsupported architecture: $BUILDARCH"; \
exit 1; \
fi
RUN \ RUN \

1
ubuntu-mate/Dockerfile
View file

@ -2,6 +2,7 @@ FROM ghcr.io/linuxserver/rdesktop:ubuntu-mate
# set version label # set version label
ARG BUILD_DATE ARG BUILD_DATE
ARG BUILDARCH ARG BUILDARCH
ARG TARGETARCH
ARG VERSION ARG VERSION
LABEL build_version="based on Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL build_version="based on Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="Michael Trip" LABEL maintainer="Michael Trip"