fix image building

percona · Apr 22, 2019 · 76a8981 · 76a8981
1 parent 3da5ee8
commit 76a8981
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 34 deletions.
diff --git a/build/Dockerfile.mongod36 b/build/Dockerfile.mongod36
@@ -1,11 +1,6 @@
 FROM centos:7
 MAINTAINER Percona Development <info@percona.com>
 
-COPY \
-	vendor/github.com/percona/mongodb-orchestration-tools/bin/mongodb-healthcheck \
-	vendor/github.com/percona/mongodb-orchestration-tools/bin/k8s-mongodb-initiator \
-	/usr/local/bin/
-
 # check repository package signature in secure way
 RUN export GNUPGHOME="$(mktemp -d)" \
         && gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A \
@@ -24,21 +19,30 @@ RUN useradd -u 1001 -r -g 0 -s /sbin/nologin \
             -c "Default Application User" mongodb
 
 ENV PERCONA_MAJOR 36
-ENV PERCONA_VERSION 3.6.10-3.0.el7
+ENV PERCONA_VERSION 3.6.11-3.1.el7
+ENV K8S_TOOLS_VERSION 0.4.2
 
 RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \
         && yum install -y \
                 Percona-Server-MongoDB-36-server-${PERCONA_VERSION} \
+                Percona-Server-MongoDB-36-mongos-${PERCONA_VERSION} \
+                Percona-Server-MongoDB-36-tools-${PERCONA_VERSION} \
+                Percona-Server-MongoDB-36-shell-${PERCONA_VERSION} \
                 curl \
                 jq \
         && yum clean all \
         && rm -rf /var/cache/yum /data/db  && mkdir -p /data/db \
         && chown -R 1001:0 /data/db
 
+
+RUN curl -fSL https://github.com/percona/mongodb-orchestration-tools/releases/download/${K8S_TOOLS_VERSION}/k8s-mongodb-initiator -o /usr/local/bin/k8s-mongodb-initiator \
+    && curl -fSL  https://github.com/percona/mongodb-orchestration-tools/releases/download/${K8S_TOOLS_VERSION}/mongodb-healthcheck -o /usr/local/bin/mongodb-healthcheck \
+    && chmod 0755 /usr/local/bin/k8s-mongodb-initiator /usr/local/bin/mongodb-healthcheck
+
 VOLUME ["/data/db"]
 
-RUN curl -o /entrypoint.sh https://raw.githubusercontent.com/percona/percona-docker/master/percona-server-mongodb.36/ps-entry.sh \
-    && chmod 755 /entrypoint.sh
+
+COPY build/ps-entry.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]
 
 EXPOSE 27017

diff --git a/build/Dockerfile.mongod40 b/build/Dockerfile.mongod40
@@ -1,11 +1,6 @@
 FROM centos:7
 MAINTAINER Percona Development <info@percona.com>
 
-COPY \
-	vendor/github.com/percona/mongodb-orchestration-tools/bin/mongodb-healthcheck \
-	vendor/github.com/percona/mongodb-orchestration-tools/bin/k8s-mongodb-initiator \
-	/usr/local/bin/
-
 # check repository package signature in secure way
 RUN export GNUPGHOME="$(mktemp -d)" \
         && gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A \
@@ -17,14 +12,15 @@ RUN export GNUPGHOME="$(mktemp -d)" \
         && rm -rf "$GNUPGHOME" /tmp/percona-release.rpm \
         && rpm --import /etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY \
         && percona-release disable all \
-        && percona-release enable psmdb-40 release
+        && percona-release enable psmdb-40 testing
 
 # the numeric UID is needed for OpenShift
 RUN useradd -u 1001 -r -g 0 -s /sbin/nologin \
             -c "Default Application User" mongodb
 
 ENV PERCONA_MAJOR 40
-ENV PERCONA_VERSION 4.0.6-3.el7
+ENV PERCONA_VERSION 4.0.9-5.el7
+ENV K8S_TOOLS_VERSION 0.4.2
 
 RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \
         && yum install -y \
@@ -38,10 +34,15 @@ RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.n
         && rm -rf /var/cache/yum /data/db  && mkdir -p /data/db \
         && chown -R 1001:0 /data/db
 
+
+RUN curl -fSL https://github.com/percona/mongodb-orchestration-tools/releases/download/${K8S_TOOLS_VERSION}/k8s-mongodb-initiator -o /usr/local/bin/k8s-mongodb-initiator \
+    && curl -fSL  https://github.com/percona/mongodb-orchestration-tools/releases/download/${K8S_TOOLS_VERSION}/mongodb-healthcheck -o /usr/local/bin/mongodb-healthcheck \
+    && chmod 0755 /usr/local/bin/k8s-mongodb-initiator /usr/local/bin/mongodb-healthcheck
+
 VOLUME ["/data/db"]
 
-RUN curl -o /entrypoint.sh https://raw.githubusercontent.com/percona/percona-docker/master/percona-server-mongodb.40/ps-entry.sh \
-    && chmod 755 /entrypoint.sh
+
+COPY build/ps-entry.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]
 
 EXPOSE 27017

diff --git a/e2e-tests/build b/e2e-tests/build
@@ -17,7 +17,7 @@ build_operator() {
         git config --get remote.origin.url \
             | sed -e 's^.*github.com[:/]^github.com/^; s/.git$//'
     )
-    docker run --rm -v ${src_dir}:/go/src/${repo} golang:1.11 sh -c "
+    docker run --rm -v ${src_dir}:/go/src/${repo} golang:1.12 sh -c "
         set -o errexit
         set -o xtrace
         export GO_LDFLAGS='-w -s $GO_LDFLAGS'
@@ -45,26 +45,16 @@ build_operator() {
     docker push ${IMAGE}
 }
 
-build_tools() {
-    tools_repo="github.com/percona/mongodb-orchestration-tools"
-    docker run --rm -v ${src_dir}/vendor/${tools_repo}:/go/src/${tools_repo} golang:1.11 sh -c "
-        set -o errexit
-        set -o xtrace
- 
-        cd /go/src/${tools_repo}
-        make clean bin/mongodb-healthcheck bin/k8s-mongodb-initiator
-    "
-}
 build_mongod36() {
     pushd ${src_dir}
-        docker build --no-cache --squash -t ${IMAGE_MONGOD36} -f build/Dockerfile.mongod36 .
+        docker build -t ${IMAGE_MONGOD36} -f build/Dockerfile.mongod36 .
     popd
     docker push ${IMAGE_MONGOD36}
 }
 
 build_mongod40() {
     pushd ${src_dir}
-        docker build --no-cache --squash -t ${IMAGE_MONGOD40} -f build/Dockerfile.mongod40 .
+        docker build -t ${IMAGE_MONGOD40} -f build/Dockerfile.mongod40 .
     popd
     docker push ${IMAGE_MONGOD40}
 }
@@ -73,6 +63,5 @@ until docker ps;
     do sleep 1;
 done
 build_operator
-#build_tools
-#build_mongod40
+build_mongod40
 #build_mongod36
diff --git a/e2e-tests/functions b/e2e-tests/functions
@@ -3,8 +3,8 @@
 GIT_COMMIT=$(git rev-parse HEAD)
 GIT_BRANCH=${VERSION:-$(git rev-parse --abbrev-ref HEAD | sed -e 's^/^-^g; s^[.]^-^g;' | tr '[:upper:]' '[:lower:]')}
 IMAGE=${IMAGE:-"perconalab/percona-server-mongodb-operator:${GIT_BRANCH}"}
-IMAGE_MONGOD36=${IMAGE_MONGOD36:-"percona/percona-server-mongodb-operator:0.3.0-mongod3.6.10"}
-IMAGE_MONGOD40=${IMAGE_MONGOD40:-"percona/percona-server-mongodb-operator:0.3.0-mongod4.0.6"}
+IMAGE_MONGOD36=${IMAGE_MONGOD36:-"perconalab/percona-server-mongodb-operator:0.4.0-mongod3.6.10"}
+IMAGE_MONGOD40=${IMAGE_MONGOD40:-"perconalab/percona-server-mongodb-operator:0.4.0-mongod4.0.6"}
 IMAGE_MONGOD=$IMAGE_MONGOD40
 tmp_dir=$(mktemp -d)
 sed=$(which gsed || which sed)