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

Jump to bottom

Add AmazonLinux 2023 images and update nodesource repo #105

Merged
merged 3 commits into from
Sep 26, 2023
Merged

Add AmazonLinux 2023 images and update nodesource repo #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
531e584
support amazonlinux 2023 and update docker images
raphael-theriault-swi Sep 26, 2023
fc24251
properly mark new amazonlinux images to be built
raphael-theriault-swi Sep 26, 2023
77177bd
fix ubi images
raphael-theriault-swi Sep 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
9 changes: 5 additions & 4 deletions .github/workflows/checks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@ jobs:
path: |
.root
packages/**/dist/
packages/bindings/npm/*/oboe.node
packages/bindings/npm/*/metrics.node
packages/bindings/npm/*/*.node
packages/bindings/npm/*/liboboe.so
retention-days: 1

Expand Down Expand Up @@ -106,10 +105,12 @@ jobs:
16-ubi8
16-ubuntu18.04
18-alpine
18-amazonlinux
18-debian
18-ubi
18-ubuntu
20-alpine
20-amazonlinux
20-debian
20-ubi
20-ubuntu
Expand All @@ -136,12 +137,12 @@ jobs:
- 16-ubi8
- 16-ubuntu18.04
- 18-alpine
# - 18-amazonlinux - https://github.com/amazonlinux/amazon-linux-2023/issues/365
- 18-amazonlinux
- 18-debian
- 18-ubi
- 18-ubuntu
- 20-alpine
# - 20-amazonlinux - https://github.com/amazonlinux/amazon-linux-2023/issues/365
- 20-amazonlinux
- 20-debian
- 20-ubi
- 20-ubuntu
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ jobs:
- 16-ubi8
- 16-ubuntu18.04
- 18-alpine
# - 18-amazonlinux - https://github.com/amazonlinux/amazon-linux-2023/issues/365
- 18-amazonlinux
- 18-debian
- 18-ubi
- 18-ubuntu
- 20-alpine
# - 20-amazonlinux - https://github.com/amazonlinux/amazon-linux-2023/issues/365
- 20-amazonlinux
- 20-debian
- 20-ubi
- 20-ubuntu
Expand Down
2 changes: 1 addition & 1 deletion docker/16-amazonlinux2.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ RUN amazon-linux-extras install -y epel && \
tar \
xz

RUN curl -fsSL https://rpm.nodesource.com/setup_16.x | bash - && \
RUN yum install -y https://rpm.nodesource.com/pub_16.x/nodistro/repo/nodesource-release-nodistro-1.noarch.rpm && \
yum install -y nodejs && \
yum clean all

Expand Down
12 changes: 6 additions & 6 deletions docker/16-ubi8.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
FROM registry.access.redhat.com/ubi8-minimal
FROM registry.access.redhat.com/ubi8

RUN microdnf install -y \
RUN dnf install -y \
curl \
git \
git-lfs \
tar \
xz

RUN curl -fsSL https://rpm.nodesource.com/setup_16.x | bash - && \
microdnf module disable -y nodejs && \
microdnf install -y nodejs && \
microdnf clean -y all
RUN dnf module disable -y nodejs && \
dnf install -y https://rpm.nodesource.com/pub_16.x/nodistro/repo/nodesource-release-nodistro-1.noarch.rpm && \
dnf install -y nodejs && \
dnf clean -y all

RUN corepack enable

Expand Down
7 changes: 6 additions & 1 deletion docker/16-ubuntu18.04.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,17 @@ RUN apt-get update && apt-get install -y software-properties-common

RUN add-apt-repository ppa:git-core/ppa && \
apt-get update && apt-get install -y \
ca-certificates \
curl \
git \
git-lfs \
gnupg \
xz-utils

RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash - && \
RUN mkdir -p /etc/apt/keyrings && \
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \
apt-get update && \
apt-get install -y nodejs && \
apt-get clean

Expand Down
17 changes: 17 additions & 0 deletions docker/18-amazonlinux.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
FROM amazonlinux

RUN dnf install -y \
curl-minimal \
git \
git-lfs \
tar \
xz

RUN dnf install -y https://rpm.nodesource.com/pub_18.x/nodistro/repo/nodesource-release-nodistro-1.noarch.rpm && \
dnf install -y nodejs && \
dnf clean -y all

RUN corepack enable

WORKDIR /solarwinds-apm
ENTRYPOINT ["/bin/bash", "-c"]
14 changes: 8 additions & 6 deletions docker/18-ubi.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
FROM registry.access.redhat.com/ubi9-minimal
FROM registry.access.redhat.com/ubi9

RUN microdnf install -y \
RUN dnf install -y \
curl-minimal \
git \
git-lfs \
tar \
xz

RUN curl -fsSL https://rpm.nodesource.com/setup_18.x | bash - && \
microdnf module disable -y nodejs && \
microdnf install -y nodejs && \
microdnf clean -y all
RUN dnf module disable -y nodejs && \
dnf install -y https://rpm.nodesource.com/pub_18.x/nodistro/repo/nodesource-release-nodistro-1.noarch.rpm && \
update-crypto-policies --set LEGACY && \
dnf install -y nodejs && \
update-crypto-policies --set DEFAULT && \
dnf clean -y all

RUN corepack enable

Expand Down
7 changes: 6 additions & 1 deletion docker/18-ubuntu.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
FROM ubuntu

RUN apt-get update && apt-get install -y \
ca-certificates \
curl \
git \
git-lfs \
gnupg \
xz-utils

RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash - && \
RUN mkdir -p /etc/apt/keyrings && \
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \
apt-get update && \
apt-get install -y nodejs && \
apt-get clean

Expand Down
17 changes: 17 additions & 0 deletions docker/20-amazonlinux.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
FROM amazonlinux

RUN dnf install -y \
curl-minimal \
git \
git-lfs \
tar \
xz

RUN dnf install -y https://rpm.nodesource.com/pub_20.x/nodistro/repo/nodesource-release-nodistro-1.noarch.rpm && \
dnf install -y nodejs && \
dnf clean -y all

RUN corepack enable

WORKDIR /solarwinds-apm
ENTRYPOINT ["/bin/bash", "-c"]
14 changes: 8 additions & 6 deletions docker/20-ubi.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
FROM registry.access.redhat.com/ubi9-minimal
FROM registry.access.redhat.com/ubi9

RUN microdnf install -y \
RUN dnf install -y \
curl-minimal \
git \
git-lfs \
tar \
xz

RUN curl -fsSL https://rpm.nodesource.com/setup_20.x | bash - && \
microdnf module disable -y nodejs && \
microdnf install -y nodejs && \
microdnf clean -y all
RUN dnf module disable -y nodejs && \
dnf install -y https://rpm.nodesource.com/pub_20.x/nodistro/repo/nodesource-release-nodistro-1.noarch.rpm && \
update-crypto-policies --set LEGACY && \
dnf install -y nodejs && \
update-crypto-policies --set DEFAULT && \
dnf clean -y all

RUN corepack enable

Expand Down
7 changes: 6 additions & 1 deletion docker/20-ubuntu.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
FROM ubuntu

RUN apt-get update && apt-get install -y \
ca-certificates \
curl \
git \
git-lfs \
gnupg \
xz-utils

RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - && \
RUN mkdir -p /etc/apt/keyrings && \
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \
apt-get update && \
apt-get install -y nodejs && \
apt-get clean

Expand Down
18 changes: 18 additions & 0 deletions docker/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,15 @@ services:
links:
- apm-collector
- otel-collector
18-amazonlinux:
build:
context: .
dockerfile: 18-amazonlinux.Dockerfile
volumes:
- ..:/solarwinds-apm
links:
- apm-collector
- otel-collector
18-debian:
build:
context: .
Expand Down Expand Up @@ -102,6 +111,15 @@ services:
links:
- apm-collector
- otel-collector
20-amazonlinux:
build:
context: .
dockerfile: 20-amazonlinux.Dockerfile
volumes:
- ..:/solarwinds-apm
links:
- apm-collector
- otel-collector
20-debian:
build:
context: .
Expand Down
Loading