fix skaffold

rarimo · Dec 2, 2024 · 26fab4e · 26fab4e
1 parent 4cb8df3
commit 26fab4e
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 60 deletions.
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -4,29 +4,29 @@ on:
 
 jobs:
   converge:
-    name: Converge
-    runs-on: ubuntu-latest
+    name: Skaffold Build Manual
+    runs-on: ubuntu-22.04
     steps:
-
       - name: Checkout code
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
-      - name: Install werf
-        uses: werf/actions/[email protected]
-
       - name: Log in to registry
         # This is where you will update the personal access token to GITHUB_TOKEN
         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin
 
-      - name: Run echo
-        run: |
-          werf version
-          docker version
-          echo $GITHUB_REPOSITORY
-          echo $GITHUB_SHA
-      - name: Run Build
-        run: |
-          . $(werf ci-env github --as-file) 
-          werf export service --tag ghcr.io/$GITHUB_REPOSITORY:$GITHUB_SHA
+      - name: Cache layers
+        uses: actions/cache@v3
+        with:
+          path: "${{ github.workspace }}/.skaffold/cache"
+          key: skaffold-${{ hashFiles('**/cache') }}
+          restore-keys: |
+            skaffold-
+
+      - name: Run Skaffold pipeline as command
+        uses: hiberbee/github-action-skaffold@latest
+        id: build
+        with:
+          command: build --tag ${{ github.sha }}
+          repository: ghcr.io/${{ github.repository_owner }}
diff --git a/.github/workflows/actions_onlymain.yml b/.github/workflows/actions_onlymain.yml
@@ -9,29 +9,29 @@ on:
 
 jobs:
   converge:
-    name: Converge
-    runs-on: ubuntu-latest
+    name: Skaffold Build Only Main
+    runs-on: ubuntu-22.04
     steps:
-
       - name: Checkout code
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
-      - name: Install werf
-        uses: werf/actions/[email protected]
-
       - name: Log in to registry
         # This is where you will update the personal access token to GITHUB_TOKEN
         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin
 
-      - name: Run echo
-        run: |
-          werf version
-          docker version
-          echo $GITHUB_REPOSITORY
-          echo $GITHUB_SHA
-      - name: Run Build
-        run: |
-          . $(werf ci-env github --as-file) 
-          werf export service --tag ghcr.io/$GITHUB_REPOSITORY:$GITHUB_SHA
+      - name: Cache layers
+        uses: actions/cache@v3
+        with:
+          path: "${{ github.workspace }}/.skaffold/cache"
+          key: skaffold-${{ hashFiles('**/cache') }}
+          restore-keys: |
+            skaffold-
+
+      - name: Run Skaffold pipeline as command
+        uses: hiberbee/github-action-skaffold@latest
+        id: build
+        with:
+          command: build --tag ${{ github.sha }}
+          repository: ghcr.io/${{ github.repository_owner }}
diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml
@@ -8,32 +8,32 @@ on:
 
 jobs:
   converge:
-    name: Converge
-    runs-on: ubuntu-latest
+    name: Skaffold Build For Tag
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
-      - name: Install werf
-        uses: werf/actions/[email protected]
-
       - name: Log in to registry
         # This is where you will update the personal access token to GITHUB_TOKEN
         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin
 
-      - name: Run echo
-        run: |
-          werf version
-          docker version
-          echo $GITHUB_REPOSITORY
-          echo $GITHUB_REF_NAME
-
-      - name: Run Build
-        run: |
-          . $(werf ci-env github --as-file) 
-          werf export service --tag ghcr.io/$GITHUB_REPOSITORY:$GITHUB_REF_NAME
+      - name: Cache layers
+        uses: actions/cache@v3
+        with:
+          path: "${{ github.workspace }}/.skaffold/cache"
+          key: skaffold-${{ hashFiles('**/cache') }}
+          restore-keys: |
+            skaffold-
+
+      - name: Run Skaffold pipeline as command
+        uses: hiberbee/github-action-skaffold@latest
+        id: build
+        with:
+          command: build --tag ${{ github.sha }}
+          repository: ghcr.io/${{ github.repository_owner }}
 
       - uses: shrink/actions-docker-extract@v3
         id: extract

diff --git a/werf.yaml → .werf.yaml b/werf.yaml → .werf.yaml
diff --git a/Dockerfile b/Dockerfile
@@ -2,37 +2,30 @@ FROM golang:1.20-alpine as buildbase
 
 RUN apk add build-base git
 
-ARG CI_JOB_TOKEN
-
 WORKDIR /go/src/github.com/rarimo/rarimo-core
 
 ENV GO111MODULE="on"
 ENV CGO_ENABLED=1
 ENV GOOS="linux"
-ENV GOPRIVATE=gitlab.com/*
-ENV GONOSUMDB=gitlab.com/*
-ENV GONOPROXY=gitlab.com/*
 
-RUN echo "machine gitlab.com login gitlab-ci-token password $CI_JOB_TOKEN" > ~/.netrc
-# RUN  git config --global url."https://gitlab-ci-token:[email protected]/".insteadOf https://gitlab.com/
 COPY go.mod .
 COPY go.sum .
 RUN go mod download
 
 COPY . .
 
 RUN go mod vendor
+# TODO switch to latest cosmosvisor
+RUN go install cosmossdk.io/tools/cosmovisor/cmd/[email protected]
 
-RUN go build -o /usr/local/bin/rarimo-core github.com/rarimo/rarimo-core/cmd/rarimo-cored
-
-
-
-###
+RUN cp $GOPATH/bin/cosmovisor /usr/local/bin/cosmovisor
+RUN go build -mod=mod -o /usr/local/bin/rarimo-core github.com/rarimo/rarimo-core/cmd/rarimo-cored
 
 FROM alpine:3.9
 
 RUN apk add --no-cache ca-certificates
 
 COPY --from=buildbase /usr/local/bin/rarimo-core /usr/local/bin/rarimo-core
+COPY --from=buildbase /usr/local/bin/cosmovisor /usr/local/bin/cosmovisor
 
 ENTRYPOINT ["rarimo-core"]
diff --git a/skaffold.yaml b/skaffold.yaml
@@ -0,0 +1,5 @@
+apiVersion: skaffold/v2beta28
+kind: Config
+build:
+  artifacts:
+    - image: rarimo-core