1
0
mirror of synced 2026-01-12 00:42:56 +00:00

Fix Issue#1323: buildDocker.yml Github Action is failing due to Ubuntu 22.10 being deprecated (#1324)

* Remove trailing whitespaces in buildDocker.yml; move Dockerfile_medley base back to 20.04 since 22.10 deprecated.

* In Dockerfile_medley load tzdata early so as to avaoid problems later on.

* In Dockerfile_medley do an apt update before tzdata

* Changing dockerfile_medley to be based on 22.04 to take care on glibc problems in online_medley docker
This commit is contained in:
Frank Halasz 2023-09-16 18:09:34 -07:00 committed by GitHub
parent b772b8383c
commit b819e18c64
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 14 deletions

View File

@ -7,7 +7,7 @@
# #
# ****************************************************************************** # ******************************************************************************
FROM ubuntu:22.10 FROM ubuntu:22.04
ARG TARGETPLATFORM ARG TARGETPLATFORM
# Handle ARGs, ENV variables, and LABELs # Handle ARGs, ENV variables, and LABELs
@ -31,6 +31,12 @@ ENV LANG=C.UTF-8
# Copy over the release deb files # Copy over the release deb files
ADD ./*.deb /tmp ADD ./*.deb /tmp
# Get tzdata setup ahead of time
RUN apt-get update; \
ln -fs /usr/share/zoneinfo/America/Los_Angeles /etc/localtime; \
DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata; \
dpkg-reconfigure --frontend noninteractive tzdata
# Install Medley/Maiko and add tightvnc server and xclip to the image # Install Medley/Maiko and add tightvnc server and xclip to the image
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y apt-utils \ && apt-get install -y apt-utils \

View File

@ -20,7 +20,7 @@ name: 'Build/Push Docker Image'
# Run this workflow on ... # Run this workflow on ...
on: on:
workflow_dispatch: workflow_dispatch:
inputs: inputs:
draft: draft:
description: "Mark this as a draft release" description: "Mark this as a draft release"
type: choice type: choice
@ -33,7 +33,7 @@ on:
options: options:
- 'false' - 'false'
- 'true' - 'true'
workflow_call: workflow_call:
outputs: outputs:
successful: successful:
@ -59,7 +59,7 @@ on:
defaults: defaults:
run: run:
shell: bash shell: bash
jobs: jobs:
@ -86,7 +86,7 @@ jobs:
echo "draft=${{ inputs.draft }}" >> $GITHUB_OUTPUT; echo "draft=${{ inputs.draft }}" >> $GITHUB_OUTPUT;
echo "force=${{ inputs.force }}" >> $GITHUB_OUTPUT; echo "force=${{ inputs.force }}" >> $GITHUB_OUTPUT;
fi fi
###################################################################################### ######################################################################################
@ -100,7 +100,7 @@ jobs:
outputs: outputs:
release_not_built: ${{ steps.check.outputs.release_not_built }} release_not_built: ${{ steps.check.outputs.release_not_built }}
steps: steps:
# Checkout the actions for this repo owner # Checkout the actions for this repo owner
- name: Checkout Actions - name: Checkout Actions
uses: actions/checkout@v3 uses: actions/checkout@v3
@ -110,7 +110,7 @@ jobs:
- run: mv ./Actions_${{ github.sha }}/actions ../actions && rm -rf ./Actions_${{ github.sha }} - run: mv ./Actions_${{ github.sha }}/actions ../actions && rm -rf ./Actions_${{ github.sha }}
# Check if build already run for this commit # Check if build already run for this commit
- name: Build already completed? - name: Build already completed?
id: check id: check
continue-on-error: true continue-on-error: true
uses: ./../actions/check-sentry-action uses: ./../actions/check-sentry-action
@ -131,12 +131,12 @@ jobs:
if: | if: |
needs.sentry.outputs.release_not_built == 'true' needs.sentry.outputs.release_not_built == 'true'
|| needs.inputs.outputs.force == 'true' || needs.inputs.outputs.force == 'true'
steps: steps:
# Checkout latest commit # Checkout latest commit
- name: Checkout Medley - name: Checkout Medley
uses: actions/checkout@v3 uses: actions/checkout@v3
# Find latest release (draft or normal) # Find latest release (draft or normal)
# and download its assets # and download its assets
- name: Download linux debs from latest (draft) release - name: Download linux debs from latest (draft) release
@ -176,10 +176,10 @@ jobs:
docker_namespace="$(echo "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]')" docker_namespace="$(echo "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]')"
docker_image="${docker_namespace}/${repo_name}" docker_image="${docker_namespace}/${repo_name}"
if [ "${{ needs.inputs.outputs.draft }}" = "false" ]; if [ "${{ needs.inputs.outputs.draft }}" = "false" ];
then then
docker_tags="${docker_image}:latest,${docker_image}:${MEDLEY_RELEASE#*-}_${MAIKO_RELEASE#*-}" docker_tags="${docker_image}:latest,${docker_image}:${MEDLEY_RELEASE#*-}_${MAIKO_RELEASE#*-}"
platforms="linux/amd64,linux/arm64" platforms="linux/amd64,linux/arm64"
else else
docker_tags="${docker_image}:draft" docker_tags="${docker_image}:draft"
platforms="linux/amd64" platforms="linux/amd64"
fi fi
@ -242,7 +242,7 @@ jobs:
needs: [inputs, sentry, build_and-push] needs: [inputs, sentry, build_and-push]
steps: steps:
# Checkout the actions for this repo owner # Checkout the actions for this repo owner
- name: Checkout Actions - name: Checkout Actions
uses: actions/checkout@v3 uses: actions/checkout@v3
@ -257,10 +257,10 @@ jobs:
uses: ./../actions/set-sentry-action uses: ./../actions/set-sentry-action
with: with:
tag: "docker" tag: "docker"
- name: Output - name: Output
id: output id: output
run: | run: |
echo "build_successful='true'" >> ${GITHUB_OUTPUT} echo "build_successful='true'" >> ${GITHUB_OUTPUT}
###################################################################################### ######################################################################################