Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 4 commits into from
Sep 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .github/workflows/Dockerfile_medley
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#
# ******************************************************************************

FROM ubuntu:22.10
FROM ubuntu:22.04
ARG TARGETPLATFORM

# Handle ARGs, ENV variables, and LABELs
Expand All @@ -31,6 +31,12 @@ ENV LANG=C.UTF-8
# Copy over the release deb files
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
RUN apt-get update \
&& apt-get install -y apt-utils \
Expand Down
26 changes: 13 additions & 13 deletions .github/workflows/buildDocker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ name: 'Build/Push Docker Image'
# Run this workflow on ...
on:
workflow_dispatch:
inputs:
inputs:
draft:
description: "Mark this as a draft release"
type: choice
Expand All @@ -33,7 +33,7 @@ on:
options:
- 'false'
- 'true'

workflow_call:
outputs:
successful:
Expand All @@ -59,7 +59,7 @@ on:
defaults:
run:
shell: bash


jobs:

Expand All @@ -86,7 +86,7 @@ jobs:
echo "draft=${{ inputs.draft }}" >> $GITHUB_OUTPUT;
echo "force=${{ inputs.force }}" >> $GITHUB_OUTPUT;
fi



######################################################################################
Expand All @@ -100,7 +100,7 @@ jobs:
outputs:
release_not_built: ${{ steps.check.outputs.release_not_built }}

steps:
steps:
# Checkout the actions for this repo owner
- name: Checkout Actions
uses: actions/checkout@v3
Expand All @@ -110,7 +110,7 @@ jobs:
- run: mv ./Actions_${{ github.sha }}/actions ../actions && rm -rf ./Actions_${{ github.sha }}

# Check if build already run for this commit
- name: Build already completed?
- name: Build already completed?
id: check
continue-on-error: true
uses: ./../actions/check-sentry-action
Expand All @@ -131,12 +131,12 @@ jobs:
if: |
needs.sentry.outputs.release_not_built == 'true'
|| needs.inputs.outputs.force == 'true'

steps:
# Checkout latest commit
- name: Checkout Medley
uses: actions/checkout@v3

# Find latest release (draft or normal)
# and download its assets
- name: Download linux debs from latest (draft) release
Expand Down Expand Up @@ -176,10 +176,10 @@ jobs:
docker_namespace="$(echo "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]')"
docker_image="${docker_namespace}/${repo_name}"
if [ "${{ needs.inputs.outputs.draft }}" = "false" ];
then
then
docker_tags="${docker_image}:latest,${docker_image}:${MEDLEY_RELEASE#*-}_${MAIKO_RELEASE#*-}"
platforms="linux/amd64,linux/arm64"
else
else
docker_tags="${docker_image}:draft"
platforms="linux/amd64"
fi
Expand Down Expand Up @@ -242,7 +242,7 @@ jobs:

needs: [inputs, sentry, build_and-push]

steps:
steps:
# Checkout the actions for this repo owner
- name: Checkout Actions
uses: actions/checkout@v3
Expand All @@ -257,10 +257,10 @@ jobs:
uses: ./../actions/set-sentry-action
with:
tag: "docker"

- name: Output
id: output
run: |
echo "build_successful='true'" >> ${GITHUB_OUTPUT}

######################################################################################