Merge pull request #104 from Patrik-Stas/ci/publish-images-in-ci

Publish images in CI

get-version.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+MAJOR=`cat version.json | jq '.major'`
+MINOR=`cat version.json | jq '.minor'`
+PATCH=`cat version.json | jq '.patch'`
+echo "$MAJOR.$MINOR.$PATCH"

indyscan-api/Dockerfile

@@ -3,9 +3,9 @@ FROM node:12.14.0-alpine3.9 as BUILD
 RUN apk update && apk upgrade && \
     apk add --no-cache bash git openssh
 
-RUN apk add -y make
-RUN apk add -y g++
-RUN apk add -y python
+RUN apk add make
+RUN apk add g++
+RUN apk add python
 
 WORKDIR /usr/src/app/indyscan-storage
 COPY indyscan-storage ./

indyscan-daemon/Dockerfile

@@ -1,4 +1,4 @@
-FROM indyscan-indysdk:v1.15.0 as NODEJS
+FROM indyscan-indysdk:latest as nodejs
 
 USER root
 RUN groupadd -g 1001 indyscan && \
@@ -9,7 +9,7 @@ RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
 RUN apt-get install -y nodejs
 RUN apt-get -y remove curl && apt-get -y autoremove
 
-FROM NODEJS as BUILD
+FROM nodejs as build
 
 WORKDIR /home/indyscan/indyscan-txtype
 WORKDIR /home/indyscan/indyscan-storage
@@ -34,11 +34,11 @@ COPY --chown=indyscan:indyscan indyscan-daemon/package*.json ./
 RUN npm install --only=prod
 COPY --chown=indyscan:indyscan indyscan-daemon ./
 
-FROM NODEJS as PRODUCTION
+FROM nodejs as production
 USER indyscan
-COPY --from=BUILD --chown=indyscan:indyscan /home/indyscan/indyscan-txtype /home/indyscan/indyscan-txtype
-COPY --from=BUILD --chown=indyscan:indyscan /home/indyscan/indyscan-storage /home/indyscan/indyscan-storage
-COPY --from=BUILD --chown=indyscan:indyscan /home/indyscan/indyscan-daemon /home/indyscan/indyscan-daemon
+COPY --from=build --chown=indyscan:indyscan /home/indyscan/indyscan-txtype /home/indyscan/indyscan-txtype
+COPY --from=build --chown=indyscan:indyscan /home/indyscan/indyscan-storage /home/indyscan/indyscan-storage
+COPY --from=build --chown=indyscan:indyscan /home/indyscan/indyscan-daemon /home/indyscan/indyscan-daemon
 
 USER root
 RUN chown -R indyscan:indyscan /home/indyscan

indyscan-webapp/Dockerfile

@@ -3,9 +3,9 @@ FROM node:12.14.0-alpine3.9 as BUILD
 RUN apk update && apk upgrade && \
     apk add --no-cache bash git openssh
 
-RUN apk add -y make
-RUN apk add -y g++
-RUN apk add -y python
+RUN apk add make
+RUN apk add g++
+RUN apk add python
 
 
 WORKDIR /usr/src/app/indyscan-api-client

ubuntu-libindy/Dockerfile

@@ -24,34 +24,34 @@ RUN apt-get update && \
       unzip \
       jq
 
-
 RUN pip3 install -U \
 	pip \
 	setuptools \
 	virtualenv \
-	twine \
-	plumbum \
+	twine==1.15.0 \
+	plumbum==1.6.7 six==1.12.0 \
 	deb-pkg-tools
 
+# Install libsodium
 RUN cd /tmp && \
-   curl https://download.libsodium.org/libsodium/releases/old/libsodium-1.0.16.tar.gz | tar -xz && \
-    cd /tmp/libsodium-1.0.16 && \
-    ./configure --disable-shared && \
+   curl https://download.libsodium.org/libsodium/releases/libsodium-1.0.18.tar.gz | tar -xz && \
+    cd /tmp/libsodium-1.0.18 && \
+    ./configure && \
     make && \
     make install && \
-    rm -rf /tmp/libsodium-1.0.16
+    rm -rf /tmp/libsodium-1.0.18
 
 RUN groupadd -g 1000 indy && useradd -r -u 1000 -g indy indy
 
 WORKDIR /home/indy
 RUN chown -R indy:indy /home/indy
 USER indy
 
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain 1.39.0
+RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain 1.45.1
 ENV PATH /home/indy/.cargo/bin:$PATH
 
-ARG INDYSDK_REVISION
-ARG INDYSDK_REPO
+ARG INDYSDK_REPO=https://github.com/hyperledger/indy-sdk
+ARG INDYSDK_REVISION=v1.15.0
 
 RUN git clone "${INDYSDK_REPO}" "./indy-sdk"
 RUN cd "/home/indy/indy-sdk" && git checkout "${INDYSDK_REVISION}"

version.json

@@ -0,0 +1,5 @@
+{
+  "major": 4,
+  "minor": 1,
+  "patch": 1
+}