Merge pull request #108 from grycap/dev-srisco

Dev srisco
grycap · Mar 17, 2021 · 293a574 · 293a574
2 parents 1cb809c + bb2dd5c
commit 293a574
Show file tree

Hide file tree

Showing 19 changed files with 683 additions and 327 deletions.
diff --git a/.github/workflows/bin-downloader.yaml b/.github/workflows/bin-downloader.yaml
@@ -14,16 +14,17 @@ jobs:
     - name: Prepare
       id: prepare
       run: |
-        DOCKER_IMAGE=grycap/oscar-bin-downloader
+        DOCKER_HUB_IMAGE=grycap/oscar-bin-downloader
+        GHCR_IMAGE=ghcr.io/grycap/oscar-bin-downloader
         DOCKER_PLATFORMS=linux/amd64,linux/arm64
 
         if [[ $GITHUB_REF == refs/tags/* ]]; then
           VERSION=${GITHUB_REF#refs/tags/v}
         fi
 
-        TAGS="--tag ${DOCKER_IMAGE}:latest"
-        if [[ ! -v $VERSION ]]; then
-          TAGS="$TAGS --tag ${DOCKER_IMAGE}:${VERSION}"
+        TAGS="--tag ${DOCKER_HUB_IMAGE}:latest --tag ${GHCR_IMAGE}:latest"
+        if [[ ! -z "$VERSION" ]]; then
+          TAGS="$TAGS --tag ${DOCKER_HUB_IMAGE}:${VERSION} --tag ${GHCR_IMAGE}:${VERSION}"
         fi
 
         echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} \
@@ -32,12 +33,18 @@ jobs:
     - name: Set up Docker Buildx
       uses: crazy-max/[email protected]
 
-    - name: Login
+    - name: Docker Hub login
       env:
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
       run: echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin
 
+    - name: GHCR login
+      env:
+          GHCR_USERNAME: ${{ secrets.GHCR_USERNAME }}
+          GHCR_PASSWORD: ${{ secrets.GHCR_PASSWORD }}
+      run: echo "${GHCR_PASSWORD}" | docker login ghcr.io --username "${GHCR_USERNAME}" --password-stdin
+
     - name: Build and Push
       run: docker buildx build --output "type=image,push=true" ${{ steps.prepare.outputs.buildx_args }}
 

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -25,16 +25,17 @@ jobs:
     - name: Prepare docker buildx
       id: prepare
       run: |
-        DOCKER_IMAGE=grycap/oscar
+        DOCKER_HUB_IMAGE=grycap/oscar
+        GHCR_IMAGE=ghcr.io/grycap/oscar
         DOCKER_PLATFORMS=linux/amd64,linux/arm64
 
         if [[ $GITHUB_REF == refs/tags/* ]]; then
           VERSION=${GITHUB_REF#refs/tags/v}
         fi
 
-        TAGS="--tag ${DOCKER_IMAGE}:latest"
+        TAGS="--tag ${DOCKER_HUB_IMAGE}:latest --tag ${GHCR_IMAGE}:latest"
         if [[ ! -z "$VERSION" ]]; then
-          TAGS="$TAGS --tag ${DOCKER_IMAGE}:${VERSION}"
+          TAGS="$TAGS --tag ${DOCKER_HUB_IMAGE}:${VERSION} --tag ${GHCR_IMAGE}:${VERSION}"
         fi
 
         echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} \
@@ -45,12 +46,18 @@ jobs:
     - name: Set up Docker Buildx
       uses: crazy-max/[email protected]
 
-    - name: Login
+    - name: Docker Hub login
       env:
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
       run: echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin
 
+    - name: GHCR login
+      env:
+          GHCR_USERNAME: ${{ secrets.GHCR_USERNAME }}
+          GHCR_PASSWORD: ${{ secrets.GHCR_PASSWORD }}
+      run: echo "${GHCR_PASSWORD}" | docker login ghcr.io --username "${GHCR_USERNAME}" --password-stdin
+
     - name: Build and Push
       run: docker buildx build --output "type=image,push=true" ${{ steps.prepare.outputs.buildx_args }}
 

diff --git a/go.mod b/go.mod
@@ -1,22 +1,34 @@
-module github.com/grycap/oscar
+module github.com/grycap/oscar/v2
 
-go 1.14
+go 1.16
 
 require (
-	github.com/aws/aws-sdk-go v1.33.15
+	github.com/aws/aws-sdk-go v1.37.28
 	github.com/gin-gonic/gin v1.6.3
-	github.com/goccy/go-yaml v1.8.0
-	github.com/google/uuid v1.1.1
-	github.com/gopherjs/gopherjs v0.0.0-20190328170749-bb2674552d8f // indirect
+	github.com/goccy/go-yaml v1.8.9
+	github.com/google/gofuzz v1.2.0 // indirect
+	github.com/google/uuid v1.2.0
+	github.com/googleapis/gnostic v0.5.4 // indirect
+	github.com/gopherjs/gopherjs v0.0.0-20210202160940-bed99a852dfe // indirect
 	github.com/grycap/cdmi-client-go v0.1.1
-	github.com/kr/text v0.2.0 // indirect
-	github.com/minio/minio v0.0.0-20200730061534-fe157166cae7
-	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
-	github.com/openfaas/faas-netes v0.0.0-20200722204026-85b54f597a0d
-	github.com/smartystreets/assertions v0.0.0-20190401211740-f487f9de1cd3 // indirect
-	github.com/smartystreets/goconvey v1.6.4 // indirect
-	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
-	k8s.io/api v0.18.6
-	k8s.io/apimachinery v0.18.6
-	k8s.io/client-go v0.18.6
+	github.com/minio/minio v0.0.0-20210311070216-f92b7a562103
+	github.com/openfaas/faas-netes v0.0.0-20210305091056-d05bda90c357
+	github.com/smartystreets/assertions v1.2.0 // indirect
+	golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 // indirect
+	golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 // indirect
+	golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93 // indirect
+	golang.org/x/sys v0.0.0-20210309074719-68d13333faf2 // indirect
+	golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
+	golang.org/x/text v0.3.5 // indirect
+	golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
+	google.golang.org/appengine v1.6.7 // indirect
+	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+	k8s.io/api v0.20.4
+	k8s.io/apimachinery v0.20.4
+	k8s.io/client-go v0.20.4
+	k8s.io/klog/v2 v2.6.0 // indirect
+	k8s.io/utils v0.0.0-20210305010621-2afb4311ab10 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.1.0 // indirect
 )