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

add golden containers src artifacts #7664

Merged
merged 64 commits into from Feb 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
acfe904
add container pipelines related files
mandeepsplaha Feb 1, 2024
d27bda5
rename root.yml file
mandeepsplaha Feb 1, 2024
066202c
pass repo name and root
mandeepsplaha Feb 1, 2024
e26ee84
checkout repo
mandeepsplaha Feb 1, 2024
74780a6
set lfs: false
mandeepsplaha Feb 1, 2024
22d65d1
update containerSourceData
mandeepsplaha Feb 1, 2024
419c730
remove extra echos
mandeepsplaha Feb 1, 2024
00cc8dc
add echo statements to reflect inside functions
mandeepsplaha Feb 1, 2024
d31f215
verbose cp
mandeepsplaha Feb 1, 2024
35c6235
add publish container files
mandeepsplaha Feb 1, 2024
cdf918e
set variable in the correct job
mandeepsplaha Feb 1, 2024
12f6a24
pass output dir; add comments
mandeepsplaha Feb 1, 2024
f262dd6
improve comment
mandeepsplaha Feb 1, 2024
ce67940
add support for sbom generation
mandeepsplaha Feb 1, 2024
925597f
add missing print
mandeepsplaha Feb 1, 2024
7699e7e
create dir before using
mandeepsplaha Feb 1, 2024
7d8ae3e
call script using /bin/bash
mandeepsplaha Feb 1, 2024
8d48160
fix path
mandeepsplaha Feb 1, 2024
cbc8956
debug
mandeepsplaha Feb 1, 2024
d52aff7
revert
mandeepsplaha Feb 1, 2024
2229dce
file name change
mandeepsplaha Feb 1, 2024
a128df3
improve sbom generate function
mandeepsplaha Feb 1, 2024
edbb47a
add support for distroless containers
mandeepsplaha Feb 1, 2024
8737713
fix path
mandeepsplaha Feb 1, 2024
94ec25a
get everything in wrapup
mandeepsplaha Feb 2, 2024
ad65067
remove extra call to makecache
mandeepsplaha Feb 2, 2024
30b1e1d
pass RPMS dir to distroless container build
mandeepsplaha Feb 2, 2024
6dafb21
stay in workdir
mandeepsplaha Feb 2, 2024
25748a3
add a TODO item
mandeepsplaha Feb 2, 2024
bca633b
add helpful echo messages
mandeepsplaha Feb 2, 2024
35cf9a4
fix paths for docker context
mandeepsplaha Feb 2, 2024
dadc2e2
fix dockerfile path
mandeepsplaha Feb 2, 2024
b3d0223
fix local.repo file path
mandeepsplaha Feb 2, 2024
9f5a896
fix repo name for nodejs
mandeepsplaha Feb 2, 2024
7354cc8
complete 1 todo item
mandeepsplaha Feb 2, 2024
59dd528
refactor
mandeepsplaha Feb 2, 2024
106a6b3
use variable
mandeepsplaha Feb 2, 2024
adf6f6f
fix download task pattern
mandeepsplaha Feb 3, 2024
cedef4c
fix publish_to_acr function
mandeepsplaha Feb 3, 2024
cc88a56
improve comments
mandeepsplaha Feb 3, 2024
6a11495
improve comments
mandeepsplaha Feb 3, 2024
958eec4
add container eula to busybox
mandeepsplaha Feb 3, 2024
9f5ed2d
rename script
mandeepsplaha Feb 3, 2024
998cbb0
rename script
mandeepsplaha Feb 3, 2024
f6c4305
rename yaml files
mandeepsplaha Feb 3, 2024
1cbef05
improve
mandeepsplaha Feb 4, 2024
4c91735
use marinara from base build
mandeepsplaha Feb 4, 2024
c11bb2d
update download tasks
mandeepsplaha Feb 4, 2024
38e6f98
Revert "update download tasks"
mandeepsplaha Feb 5, 2024
3d84c14
update variable name
mandeepsplaha Feb 5, 2024
f5ec999
update artifact name
mandeepsplaha Feb 5, 2024
cb373c1
add new base container build script and dockerfiles
mandeepsplaha Feb 5, 2024
0f97b40
remove yaml files
mandeepsplaha Feb 7, 2024
840b912
remove files not needed anymore
mandeepsplaha Feb 7, 2024
ca77a63
also save original image names to txt file
mandeepsplaha Feb 9, 2024
dc83d0b
add echo; use variable
mandeepsplaha Feb 9, 2024
3e13fc1
add missing echos
mandeepsplaha Feb 9, 2024
647377a
add fasttrack/2.0 branch for container acr mapping
mandeepsplaha Feb 10, 2024
6ca47a4
allow topic branch builds; provide hci redirect
mandeepsplaha Feb 10, 2024
509b471
add comment
mandeepsplaha Feb 14, 2024
3d0c0b8
update comment
mandeepsplaha Feb 14, 2024
c00bcb0
remove acr repo parser bits
mandeepsplaha Feb 14, 2024
7a5c132
cleanup
mandeepsplaha Feb 16, 2024
e0972be
add PR comment
mandeepsplaha Feb 23, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .pipelines/containerSourceData/Dockerfile-Initial
Expand Up @@ -7,7 +7,7 @@ RUN --mount=type=bind,source=./Stage/,target=/dockerStage/ \\\
tdnf install -y createrepo; \\\
cp -r ${RPMS_PATH} ${LOCAL_REPO_PATH}; \\\
cat /dockerStage/marinerLocalRepo.repo >> /etc/yum.repos.d/local.repo; \\\
createrepo --database ${LOCAL_REPO_PATH} --workers 10; tdnf makecache \&\& tdnf makecache; \\\
createrepo --database ${LOCAL_REPO_PATH} --workers 10; tdnf makecache; \\\
tdnf autoremove -y createrepo; \\\
for rpm in "${RPMS_TO_INSTALL[@]}"; do \\\
echo "RPM: $rpm"; \\\
Expand Down
14 changes: 0 additions & 14 deletions .pipelines/containerSourceData/azurecli/Dockerfile-AzureCLI

This file was deleted.

1 change: 0 additions & 1 deletion .pipelines/containerSourceData/azurecli/azurecli.pkg

This file was deleted.

Expand Up @@ -5,14 +5,14 @@ ARG BASE_IMAGE

FROM $BASE_IMAGE AS BASE

ARG MARINER_VERSION=2.0
ARG AZL_VERSION=2.0
ARG USERNAME=nonroot
ARG USER_UID=65532
ARG USER_GID=$USER_UID
ARG SET_USER=$USERNAME

RUN mkdir -p /staging/etc \
&& tdnf install -y --releasever=$MARINER_VERSION shadow-utils \
&& tdnf install -y --releasever=$AZL_VERSION shadow-utils \
&& groupadd --gid $USER_GID $USERNAME \
&& useradd --gid $USER_GID -g $USERNAME $USERNAME -u $USER_UID \
&& tdnf clean all \
Expand Down
Expand Up @@ -5,12 +5,32 @@ ARG BASE_IMAGE

FROM $BASE_IMAGE AS BASE

ARG MARINER_VERSION=2.0
ARG AZL_VERSION=2.0

ARG RPMS
ARG LOCAL_REPO_FILE="local.repo"
ARG LOCAL_REPO_PATH="/localrepo"

COPY ${RPMS} /WORKDIR/RPMS
COPY ${LOCAL_REPO_FILE} /WORKDIR/REPO/local.repo

# Create local repo if RPMS are provided
# This will allow the user to install packages from the local repo
# instead of fetching from PMC
RUN if [ "${RPMS}" ]; then \
mkdir -p $LOCAL_REPO_PATH; \
tdnf install -y --releasever=$AZL_VERSION createrepo; \
cp -r /WORKDIR/RPMS ${LOCAL_REPO_PATH}; \
cp /WORKDIR/REPO/local.repo /etc/yum.repos.d/local.repo; \
createrepo --database ${LOCAL_REPO_PATH} --workers 10; \
tdnf makecache; \
tdnf autoremove -y createrepo; \
fi

# Install busybox, glibc, and their dependencies into a staging location.
# Staging directory is copied into the final scratch image.
RUN mkdir /staging \
&& tdnf install -y --releasever=$MARINER_VERSION --installroot /staging \
&& tdnf install -y --releasever=$AZL_VERSION --installroot /staging \
busybox glibc \
&& tdnf clean all \
&& pushd /staging \
Expand All @@ -37,5 +57,5 @@ FROM scratch

# Copy dependencies into the scratch image.
COPY --from=BASE /staging/ .

COPY --from=BASE EULA-Container.txt /
CMD [ "sh" ]
Expand Up @@ -6,14 +6,14 @@ ARG FINAL_IMAGE

FROM $BASE_IMAGE AS BASE

ARG MARINER_VERSION=2.0
ARG AZL_VERSION=2.0
ARG USERNAME=nonroot
ARG USER_UID=65532
ARG USER_GID=$USER_UID
ARG SET_USER=$USERNAME

RUN mkdir -p /staging/etc \
&& tdnf install -y --releasever=$MARINER_VERSION shadow-utils \
&& tdnf install -y --releasever=$AZL_VERSION shadow-utils \
&& groupadd --gid $USER_GID $USERNAME \
&& useradd --gid $USER_GID -g $USERNAME $USERNAME -u $USER_UID \
&& tdnf clean all \
Expand Down
@@ -0,0 +1,8 @@
bash
bzi
coreutils
gmp
grep
libselinux
pcre
pcre-libs
@@ -0,0 +1,2 @@
distroless-packages-base
nodejs18
@@ -0,0 +1,8 @@
bash
bzi
coreutils
gmp
grep
libselinux
pcre
pcre-libs
@@ -0,0 +1,2 @@
distroless-packages-base
prometheus
@@ -0,0 +1,8 @@
bash
bzi
coreutils
gmp
grep
libselinux
pcre
pcre-libs
@@ -0,0 +1,2 @@
distroless-packages-base
prometheus-adapter
@@ -0,0 +1,8 @@
bash
bzi
coreutils
gmp
grep
libselinux
pcre
pcre-libs
2 changes: 2 additions & 0 deletions .pipelines/containerSourceData/python/distroless/python.pkg
@@ -0,0 +1,2 @@
distroless-packages-base
python3