Stac 0 produce images

.ci-builders/runner7-circle-rpm/Dockerfile → .ci-builders/centos6-base/Dockerfile

@@ -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
 
@@ -90,13 +90,13 @@ RUN conda init bash
 RUN source /root/.bashrc && conda activate ddpy2 \
     && pip install -i https://pypi.python.org/simple pip==${DD_PIP_VERSION} \
     && pip install --ignore-installed setuptools==${DD_SETUPTOOLS_VERSION} \
-    && pip install invoke distro==1.4.0 awscli==1.16.240
+    && pip install invoke==1.7.0 distro==1.4.0 awscli==1.16.240 lexicon==2.0.1
 
 # Update pip, setuptools and misc deps
 RUN source /root/.bashrc && conda activate ddpy3 \
     && pip install -i https://pypi.python.org/simple pip==${DD_PIP_VERSION} \
     && pip install --ignore-installed setuptools==${DD_SETUPTOOLS_VERSION} \
-    && pip install invoke distro==1.4.0 awscli==1.16.240
+    && pip install invoke==1.7.0 distro==1.4.0 awscli==1.16.240 lexicon==2.0.1
 
 # Add systemd headers
 COPY ./rpm-headers/systemd /usr/include/systemd

.ci-builders/centos6-base/Makefile

@@ -0,0 +1,18 @@
+RUNTIMETAG := $(shell date +%Y%m%d)
+DOCKER_REPOSITORY ?= docker.io
+
+version:
+	echo $(RUNTIMETAG) | tail -1 > version.txt
+
+
+build:
+	docker build -t $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:centos6_$(RUNTIMETAG) .
+push:
+	docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:centos6_$(RUNTIMETAG)
+
+tag_latest:
+	docker tag $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:centos6_$(RUNTIMETAG) $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:centos6_latest
+
+push_latest:
+	docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:centos6_latest
+

.ci-builders/runner7-circle-rpm7/Dockerfile → .ci-builders/centos7-base/Dockerfile

@@ -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
 
@@ -53,9 +52,9 @@ RUN cd tmp/ && curl -OL https://www.kernel.org/pub/software/scm/git/git-2.10.1.t
 RUN git config --global user.email "gitlab@stackstate" && git config --global user.name "Gitlab Stackstate"
 
 # RVM
-COPY ./rvm/gpg-keys /gpg-keys
-RUN gpg --import /gpg-keys/*
-RUN rm -rf /gpg-keys
+#RUN gpg --keyserver hkp://pgp.mit.edu --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
+RUN curl -sSL https://rvm.io/mpapis.asc | gpg --import -
+RUN curl -sSL https://rvm.io/pkuczynski.asc | gpg --import -
 RUN curl -sSL https://get.rvm.io | bash -s stable --version latest-1.29
 RUN /bin/bash -l -c "rvm requirements"
 RUN /bin/bash -l -c "rvm install 2.4.2 && rvm cleanup all"
@@ -105,13 +104,13 @@ RUN conda init bash
 RUN source /root/.bashrc && conda activate ddpy2 \
     && pip install -i https://pypi.python.org/simple pip==${DD_PIP_VERSION} \
     && pip install --ignore-installed setuptools==${DD_SETUPTOOLS_VERSION} \
-    && pip install invoke distro==1.4.0 awscli==1.16.240
+    && pip install invoke==1.7.0 distro==1.4.0 awscli==1.16.240 lexicon==2.0.1
 
 # Update pip, setuptools and misc deps
 RUN source /root/.bashrc && conda activate ddpy3 \
     && pip install -i https://pypi.python.org/simple pip==${DD_PIP_VERSION} \
     && pip install --ignore-installed setuptools==${DD_SETUPTOOLS_VERSION} \
-    && pip install invoke distro==1.4.0 awscli==1.16.240
+    && pip install invoke==1.7.0 distro==1.4.0 awscli==1.16.240 lexicon==2.0.1
 
 # Add systemd headers
 COPY ./rpm-headers/systemd /usr/include/systemd
@@ -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==1.16 boto3==1.8.0 sts-rpm-s3==0.3.3
 
 RUN yum -y install net-snmp-devel python-deltarpm yum-utils libtool rpm-sign createrepo
 

.ci-builders/centos7-base/Makefile

@@ -0,0 +1,18 @@
+RUNTIMETAG := $(shell date +%Y%m%d)
+DOCKER_REPOSITORY ?= docker.io
+
+version:
+	echo $(RUNTIMETAG) | tail -1 > version.txt
+
+build:
+	docker build -t $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:centos7_$(RUNTIMETAG) .
+
+push:
+	docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:centos7_$(RUNTIMETAG)
+
+tag_latest:
+	docker tag $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:centos7_$(RUNTIMETAG) $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:centos7_latest
+
+push_latest:
+	docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:centos7_latest
+

.ci-builders/runner7-gitlab-rpm7/Dockerfile → .ci-builders/centos7/Dockerfile

@@ -1,4 +1,5 @@
-FROM docker.io/stackstate/stackstate-agent-runner-circle:centos7_latest_v7
+ARG BASE_IMAGE=centos7_latest
+FROM docker.io/stackstate/stackstate-agent-runner-gitlab:${BASE_IMAGE}
 
 # force update root certificates, in particular might return DST Root CA X3
 RUN yum -y update ca-certificates && yum -y reinstall ca-certificates

.ci-builders/centos7/Makefile

@@ -0,0 +1,12 @@
+RUNTIMETAG := $(shell date +%Y%m%d)
+DOCKER_REPOSITORY ?= docker.io
+BASE_IMAGE ?= centos7_latest
+
+version:
+	echo $(RUNTIMETAG) | tail -1 > version.txt
+
+build:
+	docker build --build-arg BASE_IMAGE=$(BASE_IMAGE) -t $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:centos7_$(RUNTIMETAG) .
+
+push:
+	docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:centos7_$(RUNTIMETAG)

.ci-builders/runner7-circle-deb/Dockerfile → .ci-builders/debian-base/Dockerfile

@@ -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
 
@@ -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://github.com/rvm/rvm/master/binscripts/rvm-installer | bash -s stable --version latest-1.29
 
 # # Ruby,,,
 RUN mkdir -p /usr/local/etc \
@@ -103,17 +102,17 @@ RUN conda init bash
 RUN conda create -n ddpy2 python python=2
 RUN conda create -n ddpy3 python python=3.8
 
-# Update pip, setuptools and misc deps
+# Update pip, setuptools and misc deps for ddpy2
 RUN /bin/bash -c "source /root/.bashrc && conda activate ddpy2 \
     && pip install -i https://pypi.python.org/simple pip==${DD_PIP_VERSION} \
     && pip install --ignore-installed setuptools==${DD_SETUPTOOLS_VERSION} \
-    && pip install invoke distro==1.4.0 awscli==1.16.240"
+    && pip install invoke==1.7.0 distro==1.4.0 awscli==1.16.240 lexicon==2.0.1"
 
-# Update pip, setuptools and misc deps
+# Update pip, setuptools and misc deps for ddpy3
 RUN /bin/bash -c  "source /root/.bashrc && conda activate ddpy3 \
     && pip install -i https://pypi.python.org/simple pip==${DD_PIP_VERSION} \
     && pip install --ignore-installed setuptools==${DD_SETUPTOOLS_VERSION} \
-    && pip install invoke distro==1.4.0 awscli==1.16.240"
+    && pip install invoke==1.7.0 distro==1.4.0 awscli==1.16.240 lexicon==2.0.1"
 
 # [VS] not needed if we base on GO base image.
 # Gimme
@@ -168,8 +167,6 @@ RUN apt-get install -y apt-utils libtool && apt-get install -y --only-upgrade li
 # For some tests
 RUN apt-get install sudo
 
-# TODO: to be moved to conda virtualenvs
-#RUN pip install awscli boto3 sa-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

.ci-builders/debian-base/Makefile

@@ -0,0 +1,23 @@
+RUNTIMETAG := $(shell date +%Y%m%d)
+DOCKER_REPOSITORY ?= docker.io
+
+version:
+	echo $(RUNTIMETAG) | tail -1 > version.txt
+
+build:
+	docker build -t $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb7_$(RUNTIMETAG) .
+
+tag:
+	docker tag $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb7_$(RUNTIMETAG) $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb7_$(RUNTIMETAG)
+
+push:
+	docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb7_$(RUNTIMETAG)
+
+try:
+	docker run -it $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb7_$(RUNTIMETAG) sh
+
+tag_latest:
+	docker tag $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb7_$(RUNTIMETAG) $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb7_latest
+
+push_latest:
+	docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb7_latest

.ci-builders/debian-rpmpublisher/Dockerfile

@@ -0,0 +1,7 @@
+FROM docker.io/python:3.10.4-slim-buster
+
+RUN pip install boto3==1.8.0 sts-rpm-s3==0.3.3 invoke==1.7.0 distro==1.4.0 awscli==1.16
+RUN apt update  && apt-get install -y libkrb5-dev unixodbc-dev rpm python-deltarpm createrepo yum-utils gnupg2
+
+ADD rpmmacros /root/.rpmmacros
+

.ci-builders/debian-rpmpublisher/Makefile

@@ -0,0 +1,8 @@
+RUNTIMETAG := $(shell date +%Y%m%d)
+DOCKER_REPOSITORY ?= docker.io
+BASE_IMAGE ?= deb7_latest
+
+build:
+	docker build --build-arg BASE_IMAGE=$(BASE_IMAGE) -t $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher_$(RUNTIMETAG) .
+push:
+	docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher_$(RUNTIMETAG)

.ci-builders/runner7-gitlab-deb/Dockerfile → .ci-builders/debian/Dockerfile

@@ -1,4 +1,5 @@
-FROM docker.io/stackstate/stackstate-agent-runner-circle:deb7_latest
+ARG BASE_IMAGE=deb7_latest
+FROM docker.io/stackstate/stackstate-agent-runner-gitlab:${BASE_IMAGE}
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y nano libtool-bin libelf-dev gnupg2 locales
 RUN echo 'export PATH=$HOME/bin:$PATH' >> /root/.bashrc
@@ -9,15 +10,14 @@ 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
 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"]

.ci-builders/debian/Makefile

@@ -0,0 +1,13 @@
+RUNTIMETAG := $(shell date +%Y%m%d)
+DOCKER_REPOSITORY ?= docker.io
+BASE_IMAGE ?= deb7_latest
+
+version:
+	echo $(RUNTIMETAG) | tail -1 > version.txt
+
+build:
+	docker build --build-arg BASE_IMAGE=$(BASE_IMAGE) -t $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb7_$(RUNTIMETAG) .
+try:
+	docker run -it $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb7_$(RUNTIMETAG) bash
+push:
+	docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb7_$(RUNTIMETAG)

.ci-builders/runner-circle-deb/Dockerfile

@@ -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==1.16 boto3==1.8.0 sts-rpm-s3==0.3.3
 RUN apt-get install -y libkrb5-dev unixodbc-dev rpm python-deltarpm createrepo yum-utils bison

.ci-builders/runner-circle-deb/Makefile

@@ -1,12 +1,13 @@
 RUNTIMETAG := $(shell date +%Y%m%d)
+DOCKER_REPOSITORY ?= docker.io
 
 build:
-	docker build -t docker.io/stackstate/stackstate-agent-runner-circle:deb_$(RUNTIMETAG) .
+	docker build -t $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb_$(RUNTIMETAG) .
 push:
-	docker push docker.io/stackstate/stackstate-agent-runner-circle:deb_$(RUNTIMETAG)
+	docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb_$(RUNTIMETAG)
 
 tag_latest:
-	docker tag docker.io/stackstate/stackstate-agent-runner-circle:deb_$(RUNTIMETAG) docker.io/stackstate/stackstate-agent-runner-circle:deb_latest
+	docker tag $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb_$(RUNTIMETAG) $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb_latest
 
 push_latest:
-	docker push docker.io/stackstate/stackstate-agent-runner-circle:deb_latest
+	docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb_latest

.ci-builders/runner-circle-rpm/Dockerfile

@@ -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==1.16 boto3==1.8.0 sts-rpm-s3==0.3.3
 
 RUN yum -y install net-snmp-devel python-deltarpm yum-utils libtool rpm-sign createrepo

.ci-builders/runner-circle-rpm/Makefile

@@ -1,5 +1,5 @@
 build:
-	docker build -t docker.io/stackstate/stackstate-agent-runner-circle:centos6 .
+	docker build -t docker.io/stackstate/stackstate-agent-runner-gitlab:centos6 .
 push:
-	docker push docker.io/stackstate/stackstate-agent-runner-circle:centos6
+	docker push docker.io/stackstate/stackstate-agent-runner-gitlab:centos6
 

.ci-builders/runner-gitlab-deb/Dockerfile

@@ -1,6 +1,6 @@
-FROM docker.io/stackstate/stackstate-agent-runner-circle:latest
+FROM docker.io/stackstate/stackstate-agent-runner-gitlab:latest
 
-RUN pip install awscli boto3 sa-rpm-s3
+RUN pip install awscli==1.16 boto3==1.8.0 sts-rpm-s3==0.3.3
 #RUN apt-get install -y libkrb5-dev unixodbc-dev rpm python-deltarpm createrepo yum-utils
 
 ADD rpmmacros /root/.rpmmacros

.ci-builders/runner-gitlab-rpm/Dockerfile

@@ -1,6 +1,6 @@
-FROM docker.io/stackstate/stackstate-agent-runner-circle:centos6
+FROM docker.io/stackstate/stackstate-agent-runner-gitlab:centos6
 
-RUN pip install awscli boto3 sa-rpm-s3
+RUN pip install awscli==1.16 boto3==1.8.0 sts-rpm-s3==0.3.3
 
 RUN yum -y install net-snmp-devel python-deltarpm yum-utils libtool rpm-sign createrepo