From ba7b4184bde2483c718ba45ff99821b5af64428e Mon Sep 17 00:00:00 2001 From: kokal33 Date: Thu, 5 Oct 2023 17:20:00 +0200 Subject: [PATCH 1/5] docker file path --- .github/workflows/deploy.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index f1a2da56..74a90f8a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,10 +1,16 @@ name: Docker Image CI/CD Action +# on: +# push: +# tags: +# - '*' + on: push: - tags: - - '*' + branches: + - fix-deploy-workflow + jobs: deploy_image: runs-on: ubuntu-latest @@ -30,8 +36,7 @@ jobs: - name: Build and tag Docker image run: | echo "Building Docker image..." - docker build -f http-server/Dockerfile -t "public.ecr.aws/b3c4u5n1/filecoin-core-api:${{ github.ref_name }}" http-server - + docker build -f http-server/Dockerfile -t "public.ecr.aws/b3c4u5n1/filecoin-core-api:${{ github.ref_name }}" . - name: Push Docker image to ECR run: | echo "Pushing Docker image to ECR..." From 3cd172d1df1542ec6ed731cdbc638040f482723e Mon Sep 17 00:00:00 2001 From: kokal33 Date: Thu, 5 Oct 2023 17:44:56 +0200 Subject: [PATCH 2/5] Rearange private key, dockerfile --- Dockerfile | 17 +++++++++++ .../gh-private-key.pem => gh-private-key.pem | 0 http-server/Dockerfile | 11 -------- lib/gh-private-key.pem | 28 ------------------- lib/src/external_services/github.rs | 2 +- 5 files changed, 18 insertions(+), 40 deletions(-) create mode 100644 Dockerfile rename http-server/gh-private-key.pem => gh-private-key.pem (100%) delete mode 100644 http-server/Dockerfile delete mode 100644 lib/gh-private-key.pem diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..ea099217 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,17 @@ +FROM rust:1.71 AS builder +COPY Cargo.toml Cargo.lock gh-private-key.pem ./ +COPY ./http-server ./http-server +COPY ./database ./database +COPY ./lib ./lib +COPY ./fplus ./fplus + +# Change workdir to http-server and then build +WORKDIR ./http-server +RUN cargo build --release + +FROM debian:bullseye + +# Needed for openssl(hyper uses it) +RUN apt-get update && apt-get install -y libssl-dev ca-certificates && rm -rf /var/lib/apt/lists/* +COPY --from=builder ./http-server/target/release/http-server ./target/release/http-server +CMD ["/target/release/http-server"] diff --git a/http-server/gh-private-key.pem b/gh-private-key.pem similarity index 100% rename from http-server/gh-private-key.pem rename to gh-private-key.pem diff --git a/http-server/Dockerfile b/http-server/Dockerfile deleted file mode 100644 index 56bef440..00000000 --- a/http-server/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM rust:1.71 AS builder -COPY Cargo.toml Cargo.lock gh-private-key.pem ./ -COPY ./src ./src -RUN cargo build --release - -FROM debian:bullseye - -# Needed for openssl(hyper uses it) -RUN apt-get update && apt-get install -y libssl-dev ca-certificates && rm -rf /var/lib/apt/lists/* -COPY --from=builder ./target/release/http-server ./target/release/http-server -CMD ["/target/release/http-server"] \ No newline at end of file diff --git a/lib/gh-private-key.pem b/lib/gh-private-key.pem deleted file mode 100644 index 45722a30..00000000 --- a/lib/gh-private-key.pem +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpAIBAAKCAQEAv9hBfOdLDLDMvD1b7ee2yK94QKildsrl4f/SjKLLxnTCoj6j -7oAvmdFoxVAvH/uxMczlOT2GibN5Qz6Eo75mBXbKaOtONWmEW6qD9QJ+d9x4p7ya -a71hiLYjD9BpocVhgcF7h98mrdPfAeYef3azJW5/+u7BVJiZ/yA9GpKA+MlhqRbB -39o+GoxJXNzKkr7zTjwkGM9O8WuT2dQybLH7B2aBAHzFKWC+9ceU+P0XWZalIl1/ -po4djsuJ75uwIC+9nsAFVuvHzD9vH5ma+37bwj9WUBiYbdFXSaInRMqlje4SIfRr -HCf2P7eZWU2hI3awG9dOE+iZUYZ5y/mOJv/kuwIDAQABAoIBAEvjuzwyrsCNa+AH -EceRwv+uUg6Z6CKO7tMxBNQ3Tg7qf1f5GZYuRSY+7YgoSQwI37aIjCDRktgEFDMi -lwvDNM5yiG1qr9x3KjGsyVhxrR+zKlOISznVh7CyBDqsQi0JTKIsrLY58y4OQwiY -RHY9uW5UQPI94mKZn0mKMkHBtJ01NLnjwpIqr0J0dnC5vwpPs99in5X5elNOUnos -4BjuGkQwRSNwFpEcNz3CSxy/NhABIEQ8Y6QNa/6QmBAE/0GWhd2szmiJkHCDi1Pe -1CobGUyJA8KfWrzpKH0ZKucAk21mi2MWbnKtcqzN7dIua6mX6u/xq2sbfAAcIYsI -skVor7kCgYEA77tJqIEVAav4y7aKo0x3Qb+2kejRQip/m57pxkX0R5PTZrxYWKHF -AoShrJfCHgM0lRxKtMjkCbZFBTIZs1tqncyDuDKKFTvy5U1Odhj2Qe+1WQecIBPe -+4C5gI9PQruN02Pv2PJzL/LRDG2yNjfdVosbRZbJdbky4QBMphZ/ibUCgYEAzN0P -ESe8j9n8PfTXmgHkDoF+AeIrc1ZQmq7KhlIv/PSU22g40yy0Xq67HWLve/eGgdhY -7GBEBc3f8mlstG5efiHHbJ57V5kEuMBjpxAaOmC2AfKTYrahj2++hCBSIqqe9gTo -4I583GW4LtBe1ppk5oHoHCa/x1IOrOEFoxG++q8CgYBCqpGcQ3FFCr7gX74EFXKg -nSC3SMhQnyLncvTNx4xcD1bdngjvdOUlgx62sWkxEXEg+kIoLimELeTZwgn1n7lx -cns60QsnRomQjMQCAYUR5whGXuBi50O+KxjrEG9ZPnD9VTBQ43N25Q6PZz4E59os -g/isjHcvvrXQblXiZiVHdQKBgQCexZSvzwQs2NzNh7yw91Ywh9uIyiiysuq1d1Iu -1/OpMEVN5nBj+fmwh+ss00iX4zaz22DPkawmc3BlB5/gFsnVJ4jPfeRJ96XZKgIR -sEEjjWCCEeZ4UuLTr98Pt5zwkRuxwAxcPRI4Hf2pCoT1/aLFo1iouL9ZUxdclOkx -gMdqsQKBgQC04ZkN/qq85Wrd4KKnWRkNEXCnPTr7dADhRVJDGiXs+5kbzU1vXjcC -pVq42rniKcpZ5uCsIISmE9LXMiMD/lhaTz9Oksk0CYjO7+NWlgwB8XZJaabLeMoV -9gxYoslGn/vUS1ZRRL3LQJnO34YaI6yFzbLxcXpICFTKsxoz3B3ygw== ------END RSA PRIVATE KEY----- - diff --git a/lib/src/external_services/github.rs b/lib/src/external_services/github.rs index 01793983..81086b12 100644 --- a/lib/src/external_services/github.rs +++ b/lib/src/external_services/github.rs @@ -73,7 +73,7 @@ impl GithubWrapper<'static> { .pool_idle_timeout(std::time::Duration::from_secs(15)) .build(connector); let key = - jsonwebtoken::EncodingKey::from_rsa_pem(include_bytes!("../../gh-private-key.pem")) + jsonwebtoken::EncodingKey::from_rsa_pem(include_bytes!("../../../gh-private-key.pem")) .unwrap(); let octocrab = OctocrabBuilder::new_empty() .with_service(client) From ee9cf95eafd3dcb70d1ca09ef75da1effffb1bea Mon Sep 17 00:00:00 2001 From: kokal33 Date: Thu, 5 Oct 2023 17:48:04 +0200 Subject: [PATCH 3/5] simplify docker build command --- .github/workflows/deploy.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 74a90f8a..281afc72 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -36,7 +36,8 @@ jobs: - name: Build and tag Docker image run: | echo "Building Docker image..." - docker build -f http-server/Dockerfile -t "public.ecr.aws/b3c4u5n1/filecoin-core-api:${{ github.ref_name }}" . + docker build -t "public.ecr.aws/b3c4u5n1/filecoin-core-api:${{ github.ref_name }}" . + - name: Push Docker image to ECR run: | echo "Pushing Docker image to ECR..." From f1ad0338dd349f0ae3b1235979647f45d073d372 Mon Sep 17 00:00:00 2001 From: kokal33 Date: Thu, 5 Oct 2023 18:02:55 +0200 Subject: [PATCH 4/5] changed dockerfile to build from the root --- Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index ea099217..d95e0ca7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,13 +5,11 @@ COPY ./database ./database COPY ./lib ./lib COPY ./fplus ./fplus -# Change workdir to http-server and then build -WORKDIR ./http-server RUN cargo build --release FROM debian:bullseye # Needed for openssl(hyper uses it) RUN apt-get update && apt-get install -y libssl-dev ca-certificates && rm -rf /var/lib/apt/lists/* -COPY --from=builder ./http-server/target/release/http-server ./target/release/http-server +COPY --from=builder ./target/release/http-server ./target/release/http-server CMD ["/target/release/http-server"] From f9dcb5f16bd00306601cfeac10a3b012e6bb8377 Mon Sep 17 00:00:00 2001 From: kokal33 Date: Thu, 5 Oct 2023 18:12:01 +0200 Subject: [PATCH 5/5] added on push tags, build/deploy success --- .github/workflows/deploy.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 281afc72..6dfa128c 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,14 +1,9 @@ name: Docker Image CI/CD Action -# on: -# push: -# tags: -# - '*' - on: push: - branches: - - fix-deploy-workflow + tags: + - '*' jobs: @@ -37,7 +32,7 @@ jobs: run: | echo "Building Docker image..." docker build -t "public.ecr.aws/b3c4u5n1/filecoin-core-api:${{ github.ref_name }}" . - + - name: Push Docker image to ECR run: | echo "Pushing Docker image to ECR..."