From af33cf5c3fcef21f78b2ffb1c61e04dab2165202 Mon Sep 17 00:00:00 2001 From: phoenix Date: Mon, 21 Jul 2025 21:58:28 -0400 Subject: [PATCH 1/5] Port change --- .gitea/workflows/workflow.yml | 10 +++++----- Dockerfile | 18 +++++++++++++++++- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/workflow.yml b/.gitea/workflows/workflow.yml index c679baa..49681f2 100644 --- a/.gitea/workflows/workflow.yml +++ b/.gitea/workflows/workflow.yml @@ -23,7 +23,7 @@ jobs: mkdir -p ~/.ssh echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/icarus_models_deploy_key chmod 600 ~/.ssh/icarus_models_deploy_key - ssh-keyscan ${{ vars.MYHOST }} >> ~/.ssh/known_hosts + ssh-keyscan -p 8122 ${{ vars.MYHOST }} >> ~/.ssh/known_hosts eval $(ssh-agent -s) ssh-add -v ~/.ssh/icarus_models_deploy_key @@ -80,7 +80,7 @@ jobs: mkdir -p ~/.ssh echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/icarus_models_deploy_key chmod 600 ~/.ssh/icarus_models_deploy_key - ssh-keyscan ${{ vars.MYHOST }} >> ~/.ssh/known_hosts + ssh-keyscan -p 8122 ${{ vars.MYHOST }} >> ~/.ssh/known_hosts eval $(ssh-agent -s) ssh-add -v ~/.ssh/icarus_models_deploy_key @@ -100,7 +100,7 @@ jobs: mkdir -p ~/.ssh echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/icarus_models_deploy_key chmod 600 ~/.ssh/icarus_models_deploy_key - ssh-keyscan ${{ vars.MYHOST }} >> ~/.ssh/known_hosts + ssh-keyscan -p 8122 ${{ vars.MYHOST }} >> ~/.ssh/known_hosts eval $(ssh-agent -s) ssh-add -v ~/.ssh/icarus_models_deploy_key @@ -119,7 +119,7 @@ jobs: mkdir -p ~/.ssh echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/icarus_models_deploy_key chmod 600 ~/.ssh/icarus_models_deploy_key - ssh-keyscan ${{ vars.MYHOST }} >> ~/.ssh/known_hosts + ssh-keyscan -p 8122 ${{ vars.MYHOST }} >> ~/.ssh/known_hosts eval $(ssh-agent -s) ssh-add -v ~/.ssh/icarus_models_deploy_key @@ -137,7 +137,7 @@ jobs: mkdir -p ~/.ssh echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/icarus_models_deploy_key chmod 600 ~/.ssh/icarus_models_deploy_key - ssh-keyscan ${{ vars.MYHOST }} >> ~/.ssh/known_hosts + ssh-keyscan -p 8122 ${{ vars.MYHOST }} >> ~/.ssh/known_hosts eval $(ssh-agent -s) ssh-add -v ~/.ssh/icarus_models_deploy_key diff --git a/Dockerfile b/Dockerfile index d6aab7f..c5ed690 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,11 +16,27 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ openssh-client git \ && rm -rf /var/lib/apt/lists/* +# Configure SSH to use the custom port (e.g., 2222) +# Replace `your-git-server.com` with your actual Git host +# RUN mkdir -p ~/.ssh && \ +# echo "Host git.kundeng.us" >> ~/.ssh/config && \ +# echo " Port 8122" >> ~/.ssh/config && \ +# echo " User git" >> ~/.ssh/config && \ +# chmod 600 ~/.ssh/config + # << --- ADD HOST KEY HERE --- >> # Replace 'yourgithost.com' with the actual hostname (e.g., github.com) -RUN mkdir -p -m 0700 ~/.ssh && \ +# RUN ssh-keyscan -p 8122 git.kundeng.us >> ~/.ssh/known_hosts +RUN mkdir -p ~/.ssh && \ ssh-keyscan git.kundeng.us >> ~/.ssh/known_hosts +# RUN ssh-add -L + +# Configure Git to use SSH (instead of HTTPS) +# RUN git config --global url."ssh://git@git.kundeng.us:8122".insteadOf "ssh://git.kundeng.us" +# RUN ssh -Tv git@git.kundeng.us -p 8122 +# RUN ssh -Tv git@git.kundeng.us + # Copy Cargo manifests COPY Cargo.toml Cargo.lock ./ -- 2.43.0 From 5e03374d6cd795c6589f3a5ae5e997e82a6e0808 Mon Sep 17 00:00:00 2001 From: phoenix Date: Mon, 21 Jul 2025 22:11:18 -0400 Subject: [PATCH 2/5] Port change --- Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index c5ed690..2775a3e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,17 +18,17 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ # Configure SSH to use the custom port (e.g., 2222) # Replace `your-git-server.com` with your actual Git host -# RUN mkdir -p ~/.ssh && \ -# echo "Host git.kundeng.us" >> ~/.ssh/config && \ -# echo " Port 8122" >> ~/.ssh/config && \ -# echo " User git" >> ~/.ssh/config && \ -# chmod 600 ~/.ssh/config +RUN mkdir -p ~/.ssh && \ + echo "Host git.kundeng.us" >> ~/.ssh/config && \ + echo " Port 8122" >> ~/.ssh/config && \ + echo " User git" >> ~/.ssh/config && \ + chmod 600 ~/.ssh/config # << --- ADD HOST KEY HERE --- >> # Replace 'yourgithost.com' with the actual hostname (e.g., github.com) # RUN ssh-keyscan -p 8122 git.kundeng.us >> ~/.ssh/known_hosts RUN mkdir -p ~/.ssh && \ - ssh-keyscan git.kundeng.us >> ~/.ssh/known_hosts + ssh-keyscan -p 8122 git.kundeng.us >> ~/.ssh/known_hosts # RUN ssh-add -L -- 2.43.0 From 21c8b398e696c1669c95cb302299f9c0180464d6 Mon Sep 17 00:00:00 2001 From: phoenix Date: Mon, 21 Jul 2025 23:14:25 -0400 Subject: [PATCH 3/5] Reverting port changes --- Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2775a3e..7e35b6d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,15 +20,16 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ # Replace `your-git-server.com` with your actual Git host RUN mkdir -p ~/.ssh && \ echo "Host git.kundeng.us" >> ~/.ssh/config && \ - echo " Port 8122" >> ~/.ssh/config && \ + # echo " Port 8122" >> ~/.ssh/config && \ echo " User git" >> ~/.ssh/config && \ chmod 600 ~/.ssh/config # << --- ADD HOST KEY HERE --- >> # Replace 'yourgithost.com' with the actual hostname (e.g., github.com) # RUN ssh-keyscan -p 8122 git.kundeng.us >> ~/.ssh/known_hosts -RUN mkdir -p ~/.ssh && \ - ssh-keyscan -p 8122 git.kundeng.us >> ~/.ssh/known_hosts +# RUN mkdir -p ~/.ssh && \ + # ssh-keyscan -p 8122 git.kundeng.us >> ~/.ssh/known_hosts +RUN ssh-keyscan git.kundeng.us >> ~/.ssh/known_hosts # RUN ssh-add -L -- 2.43.0 From cb8807a95c46e22feac90fb00d31792aed59b182 Mon Sep 17 00:00:00 2001 From: phoenix Date: Mon, 21 Jul 2025 23:20:38 -0400 Subject: [PATCH 4/5] Cleaning up Docker file --- Dockerfile | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7e35b6d..38778bc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,9 +6,6 @@ FROM rust:1.88 as builder # Set the working directory inside the container WORKDIR /usr/src/app -# Install build dependencies if needed (e.g., for certain crates like sqlx with native TLS) -# RUN apt-get update && apt-get install -y pkg-config libssl-dev - # Install build dependencies if needed (e.g., git for cloning) RUN apt-get update && apt-get install -y --no-install-recommends \ pkg-config libssl3 \ @@ -16,28 +13,13 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ openssh-client git \ && rm -rf /var/lib/apt/lists/* -# Configure SSH to use the custom port (e.g., 2222) -# Replace `your-git-server.com` with your actual Git host RUN mkdir -p ~/.ssh && \ echo "Host git.kundeng.us" >> ~/.ssh/config && \ - # echo " Port 8122" >> ~/.ssh/config && \ echo " User git" >> ~/.ssh/config && \ chmod 600 ~/.ssh/config -# << --- ADD HOST KEY HERE --- >> -# Replace 'yourgithost.com' with the actual hostname (e.g., github.com) -# RUN ssh-keyscan -p 8122 git.kundeng.us >> ~/.ssh/known_hosts -# RUN mkdir -p ~/.ssh && \ - # ssh-keyscan -p 8122 git.kundeng.us >> ~/.ssh/known_hosts RUN ssh-keyscan git.kundeng.us >> ~/.ssh/known_hosts -# RUN ssh-add -L - -# Configure Git to use SSH (instead of HTTPS) -# RUN git config --global url."ssh://git@git.kundeng.us:8122".insteadOf "ssh://git.kundeng.us" -# RUN ssh -Tv git@git.kundeng.us -p 8122 -# RUN ssh -Tv git@git.kundeng.us - # Copy Cargo manifests COPY Cargo.toml Cargo.lock ./ -- 2.43.0 From 0718e7e4638d3136726dfb6a134bd420c8981af3 Mon Sep 17 00:00:00 2001 From: phoenix Date: Mon, 21 Jul 2025 23:22:35 -0400 Subject: [PATCH 5/5] Forgot something --- .gitea/workflows/workflow.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/workflow.yml b/.gitea/workflows/workflow.yml index 49681f2..c679baa 100644 --- a/.gitea/workflows/workflow.yml +++ b/.gitea/workflows/workflow.yml @@ -23,7 +23,7 @@ jobs: mkdir -p ~/.ssh echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/icarus_models_deploy_key chmod 600 ~/.ssh/icarus_models_deploy_key - ssh-keyscan -p 8122 ${{ vars.MYHOST }} >> ~/.ssh/known_hosts + ssh-keyscan ${{ vars.MYHOST }} >> ~/.ssh/known_hosts eval $(ssh-agent -s) ssh-add -v ~/.ssh/icarus_models_deploy_key @@ -80,7 +80,7 @@ jobs: mkdir -p ~/.ssh echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/icarus_models_deploy_key chmod 600 ~/.ssh/icarus_models_deploy_key - ssh-keyscan -p 8122 ${{ vars.MYHOST }} >> ~/.ssh/known_hosts + ssh-keyscan ${{ vars.MYHOST }} >> ~/.ssh/known_hosts eval $(ssh-agent -s) ssh-add -v ~/.ssh/icarus_models_deploy_key @@ -100,7 +100,7 @@ jobs: mkdir -p ~/.ssh echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/icarus_models_deploy_key chmod 600 ~/.ssh/icarus_models_deploy_key - ssh-keyscan -p 8122 ${{ vars.MYHOST }} >> ~/.ssh/known_hosts + ssh-keyscan ${{ vars.MYHOST }} >> ~/.ssh/known_hosts eval $(ssh-agent -s) ssh-add -v ~/.ssh/icarus_models_deploy_key @@ -119,7 +119,7 @@ jobs: mkdir -p ~/.ssh echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/icarus_models_deploy_key chmod 600 ~/.ssh/icarus_models_deploy_key - ssh-keyscan -p 8122 ${{ vars.MYHOST }} >> ~/.ssh/known_hosts + ssh-keyscan ${{ vars.MYHOST }} >> ~/.ssh/known_hosts eval $(ssh-agent -s) ssh-add -v ~/.ssh/icarus_models_deploy_key @@ -137,7 +137,7 @@ jobs: mkdir -p ~/.ssh echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/icarus_models_deploy_key chmod 600 ~/.ssh/icarus_models_deploy_key - ssh-keyscan -p 8122 ${{ vars.MYHOST }} >> ~/.ssh/known_hosts + ssh-keyscan ${{ vars.MYHOST }} >> ~/.ssh/known_hosts eval $(ssh-agent -s) ssh-add -v ~/.ssh/icarus_models_deploy_key -- 2.43.0