Skip to content

Stac 0 produce images #405

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

Open
zandrewitte wants to merge 85 commits into
base: master
Choose a base branch
from
Open

Stac 0 produce images #405

Show file tree
Hide file tree
Changes from 34 commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
687d9cf
WIP publish images
zandrewitte Dec 7, 2021
1f962b3
push deb base and main runner
zandrewitte Dec 9, 2021
82cd662
gitlab ci runners wip
zandrewitte Dec 9, 2021
6bc0ba6
gitlab ci runners wip
zandrewitte Dec 9, 2021
f41ffee
build runners using docker
zandrewitte Dec 9, 2021
7aa81c3
build runners using docker
zandrewitte Dec 9, 2021
493c2a4
cleanup / fixes
zandrewitte Dec 9, 2021
d6be4cc
use shell for date
zandrewitte Dec 9, 2021
798c37f
Fix version discovery
zandrewitte Dec 9, 2021
2a9e14c
add docker service
zandrewitte Dec 9, 2021
7a8d39e
update base deb image building
zandrewitte Dec 9, 2021
1b808e5
login to docker registry
zandrewitte Dec 10, 2021
5c04d96
push to docker and quay
zandrewitte Dec 10, 2021
a234f23
disable quay for now
zandrewitte Dec 10, 2021
2842636
lint fixes
zandrewitte Dec 10, 2021
1b26965
fix cd in runner main
zandrewitte Dec 10, 2021
248e95e
gitlab ci cleanup / refactor, try publishing deb-rpm publisher
zandrewitte Dec 10, 2021
fb0726a
produce centos7 container
zandrewitte Dec 10, 2021
343294b
fix yaml inherit
zandrewitte Dec 10, 2021
b71019b
produce centos6 runner base
zandrewitte Dec 10, 2021
8465a99
make docker variables global
zandrewitte Dec 10, 2021
2a08018
fix runner image version variables
zandrewitte Dec 10, 2021
689f365
skip centos6, generalize main runner base
zandrewitte Dec 10, 2021
06cf523
produce centos7 image
zandrewitte Dec 10, 2021
b5a5168
point to newly release images, make the publish image manual trigger …
zandrewitte Dec 10, 2021
54aa7c6
Merge branch 'master' into stac-0-produce-images
julianosk Dec 15, 2021
7ac47d5
Use sts version of rpm-s3
julianosk Dec 15, 2021
fa627f0
Add manual job to publish image
julianosk Dec 15, 2021
bab0336
Use docker image
julianosk Dec 15, 2021
02d61b5
Install make before build and push
julianosk Dec 15, 2021
b19ae8b
Allow to publish runner
julianosk Dec 15, 2021
b09080b
Enable [build_runners]
julianosk Dec 15, 2021
c02acc1
Update rpmpublisher image
julianosk Dec 15, 2021
601d490
Update to rpm image to deb-rpmpublisher_20211216
julianosk Dec 16, 2021
ae02aae
Set sts-rpm-s3 to 0.3.3 [build_runners]
julianosk Dec 16, 2021
8564d72
Fix molecule kubernetes test
julianosk Dec 17, 2021
38e3706
Merge branch 'master' into stac-0-produce-images
julianosk Jan 4, 2022
a4f1642
test commit
zandrewitte Jan 5, 2022
038e793
remove test commit
zandrewitte Jan 5, 2022
4bbb6e4
build runner for deb_rpm publisher using Py2 instead of Py3 [build_ru…
zandrewitte Jan 7, 2022
fe01a56
switch runner
zandrewitte Jan 7, 2022
d01b2d0
build publisher base, use publisher base when building deb-rpm publisher
zandrewitte Jan 19, 2022
8bf537d
Merge branch 'master' into stac-0-produce-images
zandrewitte Jan 19, 2022
b6f5a96
[build_runners] documentation
zandrewitte Jan 19, 2022
6521ee5
get rid of entrypoint in deb-rpm publisher image
zandrewitte Jan 19, 2022
8b6492a
fix runner publisher base dir [build_runners]
zandrewitte Jan 19, 2022
55e97ed
try using deb7_latest for deb-rpm publisher
zandrewitte Jan 19, 2022
38b25b8
test new commit
zandrewitte Jan 19, 2022
6beb78d
revert test commit and [build_runners]
zandrewitte Jan 20, 2022
46f1dac
add entrypoint to deactivate conda [build_runners]
zandrewitte Jan 20, 2022
c12d573
copy entrypoint script [build_runners]
zandrewitte Jan 20, 2022
03118a0
Merge branch 'master' into stac-0-produce-images
julianosk May 3, 2022
00fb4cc
STAC-15134 trigger agent runners build [build_runners]
julianosk May 3, 2022
0e691f8
STAC-15134 trigger build_agent_runners
julianosk May 3, 2022
0664eab
STAC-15134 Attempt to fix build_agent_runners
julianosk May 3, 2022
88162c9
STAC-15134 Add stage to build-deb-base
julianosk May 3, 2022
ea818c6
STAC-15134 Run build_runner_base
julianosk May 3, 2022
db926d2
STAC-15134 Add rules to docker_build_base
julianosk May 3, 2022
dbb43d9
STAC-15134 Fix builders folder path
julianosk May 3, 2022
cadc690
STAC-15134 Fix builders folder path [2]
julianosk May 3, 2022
3252b92
STAC-15134 Fix rvm gpg keys
julianosk May 4, 2022
f479c33
STAC-15134 Fix rvm gpg keys [2]
julianosk May 4, 2022
58a487f
STAC-15134 Change rpmpublisher base image to python
julianosk May 4, 2022
69287ff
STAC-15134 Refactor everything
julianosk May 4, 2022
d247daa
STAC-15134 Fix base runner script
julianosk May 4, 2022
aedfb6b
STAC-15134 Fix BASE_RUNNER_TAG [build_runners]
julianosk May 4, 2022
77fa654
STAC-15134 Fix build_runner [build_runners]
julianosk May 4, 2022
9389351
STAC-15134 Debug error
julianosk May 4, 2022
322fd0c
STAC-15134 Debug BASE_RUNNER_TAG
julianosk May 4, 2022
82c0469
STAC-15134 Debug BASE_RUNNER_TAG [2]
julianosk May 4, 2022
b8c81dc
STAC-15134 Debug BASE_RUNNER_TAG [3]
julianosk May 4, 2022
4262836
STAC-15134 Full build
julianosk May 4, 2022
e92d72d
STAC-15134 Fix debian-rpmpublisher-runner
julianosk May 4, 2022
019acf5
STAC-15134 Update images
julianosk May 4, 2022
09c6be0
STAC-15134 Add lexicon to debian and gpg to rpmpublisher
julianosk May 5, 2022
1e727ea
STAC-15134 Update rpmpublisher and debian images [build_runners]
julianosk May 5, 2022
1d11bcf
STAC-15134 Add lexicon to centos7 [build_runners]
julianosk May 5, 2022
16e8fce
STAC-15134 Fix sign_rpm_package.sh [build_runners]
julianosk May 5, 2022
87cca7f
STAC-15134 Use constant for rpmpublisher
julianosk May 5, 2022
30394f0
STAC-15134 update centos7 image and push to quay.io
julianosk May 5, 2022
73c8cec
STAC-15134 Add lexicon to centos7 [build_runners]
julianosk May 5, 2022
020010d
STAC-15134 Attempt to use centos7 image to release_rpm [build_runners]
julianosk May 5, 2022
6f817c2
STAC-15134 Fix quay.io push and use previous release_rpm image [build…
julianosk May 5, 2022
74b8d37
STAC-15134 Version pin pip deps
julianosk May 6, 2022
01ae655
STAC-16520 Downgrade boto3 to be compatible with awscli 1.16
julianosk May 6, 2022
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
2 changes: 1 addition & 1 deletion .cd-builders/runner-circle-deb/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,5 +94,5 @@ RUN apt-get install -y apt-utils libtool && apt-get install -y --only-upgrade li
# For some tests
RUN apt-get install sudo

RUN pip install awscli boto3 sa-rpm-s3
RUN pip install awscli boto3 sts-rpm-s3
RUN apt-get install -y libkrb5-dev unixodbc-dev rpm python-deltarpm createrepo yum-utils bison
2 changes: 1 addition & 1 deletion .cd-builders/runner-circle-rpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,6 @@ RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \

RUN git config --global user.email "gitlab@stackstate" && git config --global user.name "Gitlab Stackstate"

RUN pip install awscli boto3 sa-rpm-s3
RUN pip install awscli boto3 sts-rpm-s3

RUN yum -y install net-snmp-devel python-deltarpm yum-utils libtool rpm-sign createrepo
2 changes: 1 addition & 1 deletion .cd-builders/runner-gitlab-deb/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM docker.io/stackstate/stackstate-agent-runner-circle:latest

RUN pip install awscli boto3 sa-rpm-s3
RUN pip install awscli boto3 sts-rpm-s3
#RUN apt-get install -y libkrb5-dev unixodbc-dev rpm python-deltarpm createrepo yum-utils

ADD rpmmacros /root/.rpmmacros
2 changes: 1 addition & 1 deletion .cd-builders/runner-gitlab-rpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM docker.io/stackstate/stackstate-agent-runner-circle:centos6

RUN pip install awscli boto3 sa-rpm-s3
RUN pip install awscli boto3 sts-rpm-s3

RUN yum -y install net-snmp-devel python-deltarpm yum-utils libtool rpm-sign createrepo

Expand Down
11 changes: 5 additions & 6 deletions .cd-builders/runner7-circle-deb/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ARG GIMME_GO_VERSION=1.13.11
ARG DD_CONDA_VERSION=4.7.10
ARG DD_PIP_VERSION=19.1
ARG DD_SETUPTOOLS_VERSION=41.0.1
ARG IBM_MQ_VERSION=9.1.5.0
ARG IBM_MQ_VERSION=9.2.4.0
ARG CMAKE_VERSION=3.14.4
ARG CLANG_VERSION=8.0.0

Expand Down Expand Up @@ -74,10 +74,9 @@ COPY ./conda.sh /etc/profile.d/

# RVM
# [VS]
COPY ./rvm/gpg-keys /gpg-keys
RUN gpg --import /gpg-keys/*
RUN rm -rf /gpg-keys
RUN curl -sSL https://get.rvm.io | bash -s stable --version latest-1.29
RUN curl -sSL https://rvm.io/mpapis.asc | gpg --import -
RUN curl -sSL https://rvm.io/pkuczynski.asc | gpg --import -
RUN curl -sSL https://raw.githubusercontent.com/rvm/rvm/master/binscripts/rvm-installer | bash -s stable --version latest-1.29

# # Ruby,,,
RUN mkdir -p /usr/local/etc \
Expand Down Expand Up @@ -169,7 +168,7 @@ RUN apt-get install -y apt-utils libtool && apt-get install -y --only-upgrade li
RUN apt-get install sudo

# TODO: to be moved to conda virtualenvs
#RUN pip install awscli boto3 sa-rpm-s3
#RUN pip install awscli boto3 sts-rpm-s3
ADD rpmmacros /root/.rpmmacros
# yum-utils #https://pkgs.org/download/yum-utils
#RUN apt-get install -y libkrb5-dev unixodbc-dev rpm python-deltarpm createrepo bison yum-utils
Expand Down
18 changes: 13 additions & 5 deletions .cd-builders/runner7-circle-deb/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,23 @@
RUNTIMETAG := $(shell date +%Y%m%d)
DOCKER_REPOSITORY ?= docker.io

version:
echo $(RUNTIMETAG) | tail -1 > version.txt

build:
docker build -t docker.io/stackstate/stackstate-agent-runner-circle:deb7_$(RUNTIMETAG) .
docker build -t $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:deb7_$(RUNTIMETAG) .

tag:
docker tag $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:deb7_$(RUNTIMETAG) $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:deb7_$(RUNTIMETAG)

push:
docker push docker.io/stackstate/stackstate-agent-runner-circle:deb7_$(RUNTIMETAG)
docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:deb7_$(RUNTIMETAG)

try:
docker run -it docker.io/stackstate/stackstate-agent-runner-circle:deb7_$(RUNTIMETAG) sh
docker run -it $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:deb7_$(RUNTIMETAG) sh

tag_latest:
docker tag docker.io/stackstate/stackstate-agent-runner-circle:deb7_$(RUNTIMETAG) docker.io/stackstate/stackstate-agent-runner-circle:deb7_latest
docker tag $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:deb7_$(RUNTIMETAG) $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:deb7_latest

push_latest:
docker push docker.io/stackstate/stackstate-agent-runner-circle:deb7_latest
docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:deb7_latest
580 changes: 0 additions & 580 deletions .cd-builders/runner7-circle-deb/rvm/gpg-keys/mpapis.asc
View file
Open in desktop

This file was deleted.

51 changes: 0 additions & 51 deletions .cd-builders/runner7-circle-deb/rvm/gpg-keys/pkuczynski.asc
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion .cd-builders/runner7-circle-rpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ARG GIMME_GO_VERSION=1.13.11
ARG DD_CONDA_VERSION=4.7.10
ARG DD_PIP_VERSION=19.1
ARG DD_SETUPTOOLS_VERSION=41.0.1
ARG IBM_MQ_VERSION=9.1.5.0
ARG IBM_MQ_VERSION=9.2.4.0
ARG CMAKE_VERSION=3.14.4
ARG CLANG_VERSION=8.0.0
Comment on lines 7 to
Copy link
Copy Markdown

@LouisParkin LouisParkin Dec 15, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now that I see this a second time in this review, I would offer the advice that we should probably not hard-code these in a Dockerfile, perhaps instead put it in gitlab-ci.yml file, or as gitlab environment variables. Doesn't have to happen today, but I think somebody should make a note (or a Jira ticket - Intermission perhaps).

Copy link
Copy Markdown

@Voronenko Voronenko Dec 15, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Such approach usually leads to situation, when you are unable to do anything locally, without knowing what is in external setup. So I would keep defaults in, as it is now.

Copy link
Copy Markdown

@julianosk julianosk Dec 16, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the feedback, @LouisParkin !


Expand Down
13 changes: 9 additions & 4 deletions .cd-builders/runner7-circle-rpm/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
RUNTIMETAG := $(shell date +%Y%m%d)
DOCKER_REPOSITORY ?= docker.io

version:
echo $(RUNTIMETAG) | tail -1 > version.txt


build:
docker build -t docker.io/stackstate/stackstate-agent-runner-circle:centos6_$(RUNTIMETAG)_v7 .
docker build -t $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:centos6_$(RUNTIMETAG) .
push:
docker push docker.io/stackstate/stackstate-agent-runner-circle:centos6_$(RUNTIMETAG)_v7
docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:centos6_$(RUNTIMETAG)

tag_latest:
docker tag docker.io/stackstate/stackstate-agent-runner-circle:centos6_$(RUNTIMETAG)_v7 docker.io/stackstate/stackstate-agent-runner-circle:centos6_latest_v7
docker tag $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:centos6_$(RUNTIMETAG) $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:centos6_latest

push_latest:
docker push docker.io/stackstate/stackstate-agent-runner-circle:centos6_latest_v7
docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:centos6_latest

5 changes: 2 additions & 3 deletions .cd-builders/runner7-circle-rpm7/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ ARG GIMME_GO_VERSION=1.13.11
ARG DD_CONDA_VERSION=4.7.10
ARG DD_PIP_VERSION=19.1
ARG DD_SETUPTOOLS_VERSION=41.0.1
# 9.1.0.9
ARG IBM_MQ_VERSION=9.2.0.0
ARG IBM_MQ_VERSION=9.2.4.0
ARG CMAKE_VERSION=3.14.4
ARG CLANG_VERSION=8.0.0
Comment on lines 7 to
Copy link
Copy Markdown

@LouisParkin LouisParkin Dec 15, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same comment as the other Dockerfiles


Expand Down Expand Up @@ -158,7 +157,7 @@ RUN mkdir -p /go/src/github.com/DataDog/datadog-agent
# Force umask to 0022
RUN echo "umask 0022" >> /root/.bashrc

RUN pip install awscli boto3 sa-rpm-s3
RUN pip install awscli boto3 sts-rpm-s3

RUN yum -y install net-snmp-devel python-deltarpm yum-utils libtool rpm-sign createrepo

Expand Down
13 changes: 9 additions & 4 deletions .cd-builders/runner7-circle-rpm7/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
RUNTIMETAG := $(shell date +%Y%m%d)
DOCKER_REPOSITORY ?= docker.io

version:
echo $(RUNTIMETAG) | tail -1 > version.txt

build:
docker build -t docker.io/stackstate/stackstate-agent-runner-circle:centos7_$(RUNTIMETAG)_v7 .
docker build -t $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:centos7_$(RUNTIMETAG) .

push:
docker push docker.io/stackstate/stackstate-agent-runner-circle:centos7_$(RUNTIMETAG)_v7
docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:centos7_$(RUNTIMETAG)

tag_latest:
docker tag docker.io/stackstate/stackstate-agent-runner-circle:centos7_$(RUNTIMETAG)_v7 docker.io/stackstate/stackstate-agent-runner-circle:centos7_latest_v7
docker tag $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:centos7_$(RUNTIMETAG) $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:centos7_latest

push_latest:
docker push docker.io/stackstate/stackstate-agent-runner-circle:centos7_latest_v7
docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:centos7_latest

5 changes: 3 additions & 2 deletions .cd-builders/runner7-gitlab-deb-rpmpublisher/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM docker.io/stackstate/stackstate-agent-runner-circle:latest
ARG BASE_RUNNER_IMAGE_VERSION=deb7_latest
FROM docker.io/stackstate/stackstate-agent-runner-circle:${BASE_RUNNER_IMAGE_VERSION}

RUN pip install boto3 sa-rpm-s3 invoke distro==1.4.0 awscli==1.16
RUN pip install boto3 sts-rpm-s3 invoke distro==1.4.0 awscli==1.16
RUN apt update && apt-get install -y libkrb5-dev unixodbc-dev rpm python-deltarpm createrepo yum-utils

ADD rpmmacros /root/.rpmmacros
8 changes: 6 additions & 2 deletions .cd-builders/runner7-gitlab-deb-rpmpublisher/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
RUNTIMETAG := $(shell date +%Y%m%d)
DOCKER_REPOSITORY ?= docker.io
BASE_RUNNER_IMAGE_VERSION ?= deb7_latest

build:
docker build -t docker.io/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher .
docker build --build-arg BASE_RUNNER_IMAGE_VERSION=$(BASE_RUNNER_IMAGE_VERSION) -t $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher_$(RUNTIMETAG) .
push:
docker push docker.io/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher
docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher_$(RUNTIMETAG)
11 changes: 6 additions & 5 deletions .cd-builders/runner7-gitlab-deb/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM docker.io/stackstate/stackstate-agent-runner-circle:deb7_latest
ARG BASE_RUNNER_IMAGE_VERSION=deb7_latest
FROM docker.io/stackstate/stackstate-agent-runner-circle:${BASE_RUNNER_IMAGE_VERSION}

RUN DEBIAN_FRONTEND=noninteractive apt-get install -y nano libtool-bin libelf-dev gnupg2 locales
RUN echo 'export PATH=$HOME/bin:$PATH' >> /root/.bashrc
Expand All @@ -9,15 +10,15 @@ RUN echo 'gem: --no-document' >> /root/.gemrc

RUN bash -c "source /usr/local/rvm/scripts/rvm && gem install deb-s3"

#RUN pip install awscli boto3 sa-rpm-s3
#RUN pip install awscli boto3 sts-rpm-s3
ADD rpmmacros /root/.rpmmacros
# yum-utils #https://pkgs.org/download/yum-utils
#RUN apt-get install -y libkrb5-dev unixodbc-dev rpm python-deltarpm createrepo bison yum-utils

RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
locale-gen
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8

SHELL ["/bin/bash", "-c"]
13 changes: 10 additions & 3 deletions .cd-builders/runner7-gitlab-deb/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
RUNTIMETAG := $(shell date +%Y%m%d)
DOCKER_REPOSITORY ?= docker.io
BASE_RUNNER_IMAGE_VERSION ?= deb7_latest

version:
echo $(RUNTIMETAG) | tail -1 > version.txt

build:
docker build -t docker.io/stackstate/stackstate-agent-runner-gitlab:latest7 .
docker build --build-arg BASE_RUNNER_IMAGE_VERSION=$(BASE_RUNNER_IMAGE_VERSION) -t $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb7_$(RUNTIMETAG) .
try:
docker run -it docker.io/stackstate/stackstate-agent-runner-gitlab:latest7 bash
docker run -it $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb7_$(RUNTIMETAG) bash
push:
docker push docker.io/stackstate/stackstate-agent-runner-gitlab:latest7
docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb7_$(RUNTIMETAG)
2 changes: 1 addition & 1 deletion .cd-builders/runner7-gitlab-rpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ RUN curl https://curl.se/ca/cacert.pem -o /etc/pki/tls/certs/ca-bundle.crt

# /workaround

RUN pip install awscli boto3 sa-rpm-s3
RUN pip install awscli boto3 sts-rpm-s3

RUN yum -y install net-snmp-devel python-deltarpm yum-utils libtool rpm-sign createrepo

Expand Down
3 changes: 2 additions & 1 deletion .cd-builders/runner7-gitlab-rpm7/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM docker.io/stackstate/stackstate-agent-runner-circle:centos7_latest_v7
ARG BASE_RUNNER_IMAGE_VERSION=centos7_latest
FROM docker.io/stackstate/stackstate-agent-runner-circle:${BASE_RUNNER_IMAGE_VERSION}

# force update root certificates, in particular might return DST Root CA X3
RUN yum -y update ca-certificates && yum -y reinstall ca-certificates
Expand Down
16 changes: 9 additions & 7 deletions .cd-builders/runner7-gitlab-rpm7/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
RUNTIMETAG := $(shell date +%Y%m%d)
TRY := 0
DOCKER_REPOSITORY ?= docker.io
BASE_RUNNER_IMAGE_VERSION ?= centos7_latest

version:
echo $(RUNTIMETAG) | tail -1 > version.txt

build:
docker build -t docker.io/stackstate/stackstate-agent-runner-gitlab:centos7_latest_v7 .
docker build --build-arg BASE_RUNNER_IMAGE_VERSION=$(BASE_RUNNER_IMAGE_VERSION) -t $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:centos7_$(RUNTIMETAG) .

push:
docker tag docker.io/stackstate/stackstate-agent-runner-gitlab:centos7_latest_v7 docker.io/stackstate/stackstate-agent-runner-gitlab:centos7_$(RUNTIMETAG)_v7_$(TRY)
docker tag docker.io/stackstate/stackstate-agent-runner-gitlab:centos7_latest_v7 docker.io/stackstate/stackstate-agent-runner-gitlab:centos7_$(RUNTIMETAG)_v7
docker push docker.io/stackstate/stackstate-agent-runner-gitlab:centos7_latest_v7
docker push docker.io/stackstate/stackstate-agent-runner-gitlab:centos7_$(RUNTIMETAG)_v7
docker push docker.io/stackstate/stackstate-agent-runner-gitlab:centos7_$(RUNTIMETAG)_v7_$(TRY)
docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:centos7_$(RUNTIMETAG)
12 changes: 6 additions & 6 deletions .gitlab-ci-agent.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:latest7
image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb7_20211210

stages:
- manual_cleanup
Expand Down Expand Up @@ -156,7 +156,7 @@ deps_deb:
deps_rpm:
stage: prepare
interruptible: true
image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos7_20211004_v7_0
image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos7_20211210
cache:
key: "deps-rpm-$STS_VER-$CI_COMMIT_REF_SLUG"
paths:
Expand Down Expand Up @@ -385,7 +385,7 @@ build_deb:
build_rpm:
stage: build
interruptible: true
image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos7_20211004_v7_0
image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos7_20211210
needs:
- deps_rpm
tags:
Expand Down Expand Up @@ -493,7 +493,7 @@ test_deb_renaming:
test_rpm_renaming:
stage: test
interruptible: true
image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos6_20190429
image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos7_20211210
needs:
- build_rpm
before_script: []
Expand Down Expand Up @@ -561,7 +561,7 @@ pre_release_win:
pre_release_rpm:
stage: pre_release
interruptible: true
image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher
image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher_20211216
needs:
- build_rpm
before_script: []
Expand Down Expand Up @@ -1165,7 +1165,7 @@ release_deb:
release_rpm:
interruptible: true
stage: release
image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher
image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher_20211216
dependencies:
- build_rpm
before_script:
Expand Down
Loading