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.

Sign up for GitHub

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

Merge opnesuse families into one #1957

Merged
merged 2 commits into from
Oct 27, 2023
Merged

Merge opnesuse families into one #1957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43a9a06
Merge opnesuse families into one
mauromorales Oct 25, 2023
3211a92
Fix issue with rpi
mauromorales Oct 26, 2023
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
18 changes: 9 additions & 9 deletions .github/flavors.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[
{
"family": "opensuse-leap",
"family": "opensuse",
"flavor": "opensuse",
"flavorRelease": "leap-15.5",
"variant": "standard",
Expand All @@ -10,7 +10,7 @@
"worker": "self-hosted"
},
{
"family": "opensuse-leap",
"family": "opensuse",
"flavor": "opensuse",
"flavorRelease": "leap-15.5",
"variant": "core",
Expand All @@ -20,7 +20,7 @@
"worker": "self-hosted"
},
{
"family": "opensuse-leap",
"family": "opensuse",
"flavor": "opensuse",
"flavorRelease": "leap-15.5",
"variant": "standard",
Expand All @@ -30,7 +30,7 @@
"worker": "ubuntu-latest"
},
{
"family": "opensuse-leap",
"family": "opensuse",
"flavor": "opensuse",
"flavorRelease": "leap-15.5",
"variant": "core",
Expand All @@ -40,7 +40,7 @@
"worker": "ubuntu-latest"
},
{
"family": "opensuse-leap",
"family": "opensuse",
"flavor": "opensuse",
"flavorRelease": "leap-15.5",
"variant": "core",
Expand All @@ -50,7 +50,7 @@
"worker": "ubuntu-latest"
},
{
"family": "opensuse-tumbleweed",
"family": "opensuse",
"flavor": "opensuse",
"flavorRelease": "tumbleweed",
"variant": "standard",
Expand All @@ -60,7 +60,7 @@
"worker": "self-hosted"
},
{
"family": "opensuse-tumbleweed",
"family": "opensuse",
"flavor": "opensuse",
"flavorRelease": "tumbleweed",
"variant": "core",
Expand All @@ -70,7 +70,7 @@
"worker": "self-hosted"
},
{
"family": "opensuse-tumbleweed",
"family": "opensuse",
"flavor": "opensuse",
"flavorRelease": "tumbleweed",
"variant": "standard",
Expand All @@ -80,7 +80,7 @@
"worker": "ubuntu-latest"
},
{
"family": "opensuse-tumbleweed",
"family": "opensuse",
"flavor": "opensuse",
"flavorRelease": "tumbleweed",
"variant": "core",
Expand Down
41 changes: 24 additions & 17 deletions images/Dockerfile.opensuse-tumbleweed → images/Dockerfile.opensuse
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,28 @@
#### ARGS ####
###############################################################
ARG MODEL=generic
ARG BASE_IMAGE=opensuse/tumbleweed
ARG BASE_IMAGE
ARG FLAVOR_RELEASE

###############################################################
#### Upstream ####
###############################################################
FROM $BASE_IMAGE AS upstream
FROM $BASE_IMAGE AS base

###############################################################
#### Arch Config ####
###############################################################
FROM upstream AS amd64-config
RUN zypper removerepo repo-openh264
FROM base AS leap-15.5-repo
RUN zypper ar -G https://download.opensuse.org/repositories/utilities/15.5/utilities.repo && \
zypper ref

FROM base AS tumbleweed-repo-amd64
RUN zypper removerepo repo-openh264 && \
zypper ref

FROM upstream AS arm64-config
FROM base AS tumbleweed-repo-arm64
RUN zypper ar https://download.opensuse.org/ports/aarch64/tumbleweed/repo/oss/ aarch64 && \
zypper ref

###############################################################
#### Common ####
###############################################################
FROM ${TARGETARCH}-config AS common
FROM tumbleweed-repo-${TARGETARCH} AS tumbleweed-repo
RUN zypper ar -G https://download.opensuse.org/repositories/utilities/openSUSE_Factory/utilities.repo && \
zypper ref

FROM ${FLAVOR_RELEASE}-repo AS common
RUN zypper in --force-resolution -y \
bash-completion \
conntrack-tools \
Expand Down Expand Up @@ -114,6 +111,7 @@ RUN zypper in --force-resolution -y \
###############################################################
FROM ${TARGETARCH} AS generic
RUN zypper in --force-resolution -y \
lldpd \
qemu-guest-agent \
&& zypper cc

Expand All @@ -130,8 +128,17 @@ RUN zypper in --force-resolution -y \
&& zypper cc
COPY rpi/config.txt /boot/config.txt

FROM rpicommon AS rpi3
FROM rpicommon AS rpi4
FROM rpicommon AS rpi-leap-15.5
# somehow these two are needed in leap
RUN zypper in --force-resolution -y \
grub2-i386-pc \
grub2-x86_64-efi \
&& zypper cc

FROM rpicommon AS rpi-tumbleweed

FROM rpi-${FLAVOR_RELEASE} AS rpi3
FROM rpi-${FLAVOR_RELEASE} AS rpi4

###############################################################
#### Post-Process Common to All ####
Expand Down
118 changes: 0 additions & 118 deletions images/Dockerfile.opensuse-leap
View file
Open in desktop

This file was deleted.