From 8909b60721d8c4f9aeac9c5b7116559913b4016f Mon Sep 17 00:00:00 2001 From: kjuulh Date: Thu, 11 Aug 2022 23:22:12 +0200 Subject: [PATCH] add first build --- .cuddle.yaml => cuddle.yaml | 0 scripts/build_cuddle_image.sh | 4 +++- templates/build_cuddle_image.Dockerfile | 9 +++------ 3 files changed, 6 insertions(+), 7 deletions(-) rename .cuddle.yaml => cuddle.yaml (100%) mode change 100644 => 100755 scripts/build_cuddle_image.sh diff --git a/.cuddle.yaml b/cuddle.yaml similarity index 100% rename from .cuddle.yaml rename to cuddle.yaml diff --git a/scripts/build_cuddle_image.sh b/scripts/build_cuddle_image.sh old mode 100644 new mode 100755 index 2ae5e1a..4205d44 --- a/scripts/build_cuddle_image.sh +++ b/scripts/build_cuddle_image.sh @@ -2,4 +2,6 @@ set -e -DOCKER_BUILDKIT=1 docker build "$TMP/build_cuddle_image.Dockerfile" +tag="$REGISTRY/$SERVICE:${COMMIT_SHA:0:10}" + +DOCKER_BUILDKIT=1 docker build -t "$tag" -f "$TMP/build_cuddle_image.Dockerfile" . diff --git a/templates/build_cuddle_image.Dockerfile b/templates/build_cuddle_image.Dockerfile index 14fc5ca..92e5231 100644 --- a/templates/build_cuddle_image.Dockerfile +++ b/templates/build_cuddle_image.Dockerfile @@ -2,12 +2,9 @@ FROM rust:1.62.1-slim-bullseye RUN apt-get update && apt-get upgrade -y -RUN apt-get install -y build-essential curl git - -WORKDIR /app/ - -RUN git clone https://git.front.kjuulh.io/kjuulh/cuddle.git +RUN apt-get install libssl-dev +RUN apt-get install -y -q build-essential curl git pkg-config WORKDIR /app/cuddle/ -RUN cargo build -p cuddle_cli --release +RUN cargo install --git https://git.front.kjuulh.io/kjuulh/cuddle.git cuddle_cli