From 046d1284a72dc04d1d3873aef0711480e863a52d Mon Sep 17 00:00:00 2001 From: Rodrigo Delduca <46259+skhaz@users.noreply.github.com> Date: Wed, 8 Nov 2023 07:38:18 -0300 Subject: [PATCH] Work in progress --- .github/workflows/deploy.yaml | 1 + Dockerfile | 9 +++------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index de5f8ba..cd022d4 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -36,5 +36,6 @@ jobs: run: | gcloud config set run/region ${{ secrets.REGION }} gcloud config set builds/use_kaniko True + gcloud config set app/cloud_build_timeout 900 gcloud run deploy ${{ secrets.SERVICE_NAME }} --source $(pwd) --platform managed --allow-unauthenticated gcloud run services update-traffic ${{ secrets.SERVICE_NAME }} --to-latest diff --git a/Dockerfile b/Dockerfile index d6e8b64..18aeafa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,9 @@ FROM ubuntu:jammy -# FROM build RUN apt-get update && apt-get upgrade -y && apt-get install -y build-essential cmake git python3 python3-pip wget zip RUN pip install conan RUN conan profile detect -#COPY profile ~/.conan2/profiles/webassembly - RUN printf '\n\ include(default) \n\ \n\ @@ -28,11 +25,11 @@ WORKDIR /opt/carimbo/build RUN conan install .. --output-folder=. --build=missing --profile=webassembly --settings compiler.cppstd=20 --settings build_type=Release -RUN cmake .. -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DCMAKE_BUILD_TYPE=Release +RUN cmake .. -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release -RUN cmake --build . --config Release --jobs $(nproc) +RUN cmake --build . --config Release -FROM golang:1.21 +# FROM golang:1.21 # WORKDIR /opt # COPY go.mod . # COPY go.sum .