From dbff3b28045bbbc8e077aef104c88bb2a67c74e5 Mon Sep 17 00:00:00 2001 From: Oleg Sucharevich Date: Fri, 15 Oct 2021 14:33:09 +0300 Subject: [PATCH] chore: use base openintegration image --- .github/workflows/release.yaml | 8 ++++---- VERSION | 2 +- catalog/shared/Dockerfile | 8 +------- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 619d498..3ab277e 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -14,16 +14,16 @@ jobs: password: ${{ secrets.DOCKERHUB_PASSWORD }} runs-on: ubuntu-latest steps: - - - name: Login to Docker Registry + - name: Login to Docker Registry run: | echo "${{ secrets.DOCKERHUB_PASSWORD }}" | \ docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin - - - name: Checkout + - name: Checkout uses: actions/checkout@v2 with: fetch-depth: 0 + - name: Build Base Image + run: docker build -t openintegration/oi:base . - run: make release-binaries env: GITHUB_TOKEN: ${{ secrets.GT_RELEASE_TOKEN }} \ No newline at end of file diff --git a/VERSION b/VERSION index 897e215..0f00ab7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.100.0 +0.101.0 diff --git a/catalog/shared/Dockerfile b/catalog/shared/Dockerfile index 6bd0ca9..f99fe32 100644 --- a/catalog/shared/Dockerfile +++ b/catalog/shared/Dockerfile @@ -1,15 +1,9 @@ -FROM golang:1.16-alpine as build - -WORKDIR /app - -RUN apk update && apk add make wget git +FROM openintegration/oi:base as build ARG SERVICE COPY . . -RUN go mod download - RUN go build -o service cmd/catalog/${SERVICE}/main.go FROM alpine