Skip to content

Commit 076c805

Browse files
mdr223mdr223
committed
trying to simplify secret creation portion of script
1 parent 9c31893 commit 076c805

File tree

3 files changed

+70
-65
lines changed

3 files changed

+70
-65
lines changed

‎.github/workflows/dev-ci-cd.yaml

Lines changed: 60 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches:
66
- main
7+
- feature/grafana
78
jobs:
89
deploy-dev-system:
910
runs-on: ubuntu-latest
@@ -30,57 +31,58 @@ jobs:
3031
- name: Create Secrets Files
3132
run: |
3233
mkdir -p ${{ github.workspace }}/deploy/dev/secrets/
33-
touch ${{ github.workspace }}/deploy/dev/secrets/imap_user.txt
34-
echo "${{ secrets.DEV_IMAP_USER }}" >> ${{ github.workspace }}/deploy/dev/secrets/imap_user.txt
35-
chmod 400 ${{ github.workspace }}/deploy/dev/secrets/imap_user.txt
36-
touch ${{ github.workspace }}/deploy/dev/secrets/imap_pw.txt
37-
echo "${{ secrets.DEV_IMAP_PW }}" >> ${{ github.workspace }}/deploy/dev/secrets/imap_pw.txt
38-
chmod 400 ${{ github.workspace }}/deploy/dev/secrets/imap_pw.txt
39-
touch ${{ github.workspace }}/deploy/dev/secrets/cleo_url.txt
40-
echo "${{ secrets.DEV_CLEO_URL }}" >> ${{ github.workspace }}/deploy/dev/secrets/cleo_url.txt
41-
chmod 400 ${{ github.workspace }}/deploy/dev/secrets/cleo_url.txt
42-
touch ${{ github.workspace }}/deploy/dev/secrets/cleo_user.txt
43-
echo "${{ secrets.DEV_CLEO_USER }}" >> ${{ github.workspace }}/deploy/dev/secrets/cleo_user.txt
44-
chmod 400 ${{ github.workspace }}/deploy/dev/secrets/cleo_user.txt
45-
touch ${{ github.workspace }}/deploy/dev/secrets/cleo_pw.txt
46-
echo "${{ secrets.DEV_CLEO_PW }}" >> ${{ github.workspace }}/deploy/dev/secrets/cleo_pw.txt
47-
chmod 400 ${{ github.workspace }}/deploy/dev/secrets/cleo_pw.txt
48-
touch ${{ github.workspace }}/deploy/dev/secrets/cleo_project.txt
49-
echo "${{ secrets.DEV_CLEO_PROJECT }}" >> ${{ github.workspace }}/deploy/dev/secrets/cleo_project.txt
50-
chmod 400 ${{ github.workspace }}/deploy/dev/secrets/cleo_project.txt
51-
touch ${{ github.workspace }}/deploy/dev/secrets/sender_server.txt
52-
echo "${{ secrets.DEV_SENDER_SERVER }}" >> ${{ github.workspace }}/deploy/dev/secrets/sender_server.txt
53-
chmod 400 ${{ github.workspace }}/deploy/dev/secrets/sender_server.txt
54-
touch ${{ github.workspace }}/deploy/dev/secrets/sender_port.txt
55-
echo "${{ secrets.DEV_SENDER_PORT }}" >> ${{ github.workspace }}/deploy/dev/secrets/sender_port.txt
56-
chmod 400 ${{ github.workspace }}/deploy/dev/secrets/sender_port.txt
57-
touch ${{ github.workspace }}/deploy/dev/secrets/sender_replyto.txt
58-
echo "${{ secrets.DEV_SENDER_REPLYTO }}" >> ${{ github.workspace }}/deploy/dev/secrets/sender_replyto.txt
59-
chmod 400 ${{ github.workspace }}/deploy/dev/secrets/sender_replyto.txt
60-
touch ${{ github.workspace }}/deploy/dev/secrets/sender_user.txt
61-
echo "${{ secrets.DEV_SENDER_USER }}" >> ${{ github.workspace }}/deploy/dev/secrets/sender_user.txt
62-
chmod 400 ${{ github.workspace }}/deploy/dev/secrets/sender_user.txt
63-
touch ${{ github.workspace }}/deploy/dev/secrets/sender_pw.txt
64-
echo "${{ secrets.DEV_SENDER_PW }}" >> ${{ github.workspace }}/deploy/dev/secrets/sender_pw.txt
65-
chmod 400 ${{ github.workspace }}/deploy/dev/secrets/sender_pw.txt
66-
touch ${{ github.workspace }}/deploy/dev/secrets/flask_uploader_app_secret_key.txt
67-
echo "${{ secrets.DEV_FLASK_UPLOADER_APP_SECRET_KEY }}" >> ${{ github.workspace }}/deploy/dev/secrets/flask_uploader_app_secret_key.txt
68-
chmod 400 ${{ github.workspace }}/deploy/dev/secrets/flask_uploader_app_secret_key.txt
69-
touch ${{ github.workspace }}/deploy/dev/secrets/uploader_salt.txt
70-
echo "${{ secrets.DEV_UPLOADER_SALT }}" >> ${{ github.workspace }}/deploy/dev/secrets/uploader_salt.txt
71-
chmod 400 ${{ github.workspace }}/deploy/dev/secrets/uploader_salt.txt
72-
touch ${{ github.workspace }}/deploy/dev/secrets/openai_api_key.txt
73-
echo "${{ secrets.OPENAI_API_KEY }}" >> ${{ github.workspace }}/deploy/dev/secrets/openai_api_key.txt
74-
chmod 400 ${{ github.workspace }}/deploy/dev/secrets/openai_api_key.txt
75-
touch ${{ github.workspace }}/deploy/dev/secrets/hf_token.txt
76-
echo "${{ secrets.HF_TOKEN }}" >> ${{ github.workspace }}/deploy/dev/secrets/hf_token.txt
77-
chmod 400 ${{ github.workspace }}/deploy/dev/secrets/hf_token.txt
78-
touch ${{ github.workspace }}/deploy/dev/secrets/pg_password.txt
79-
echo "${{ secrets.DEV_PG_PASSWORD }}" >> ${{ github.workspace }}/deploy/dev/secrets/pg_password.txt
80-
chmod 400 ${{ github.workspace }}/deploy/dev/secrets/pg_password.txt
81-
touch ${{ github.workspace }}/deploy/dev/secrets/grafana_password.txt
82-
echo "${{ secrets.DEV_GRAFANA_PASSWORD }}" >> ${{ github.workspace }}/deploy/dev/secrets/grafana_password.txt
83-
chmod 400 ${{ github.workspace }}/deploy/dev/secrets/grafana_password.txt
34+
./${{ github.workspace }}/deploy/create_secret.sh DEV_IMAP_USER imap_user.txt dev
35+
# touch ${{ github.workspace }}/deploy/dev/secrets/imap_user.txt
36+
# echo "${{ secrets.DEV_IMAP_USER }}" >> ${{ github.workspace }}/deploy/dev/secrets/imap_user.txt
37+
# chmod 400 ${{ github.workspace }}/deploy/dev/secrets/imap_user.txt
38+
# touch ${{ github.workspace }}/deploy/dev/secrets/imap_pw.txt
39+
# echo "${{ secrets.DEV_IMAP_PW }}" >> ${{ github.workspace }}/deploy/dev/secrets/imap_pw.txt
40+
# chmod 400 ${{ github.workspace }}/deploy/dev/secrets/imap_pw.txt
41+
# touch ${{ github.workspace }}/deploy/dev/secrets/cleo_url.txt
42+
# echo "${{ secrets.DEV_CLEO_URL }}" >> ${{ github.workspace }}/deploy/dev/secrets/cleo_url.txt
43+
# chmod 400 ${{ github.workspace }}/deploy/dev/secrets/cleo_url.txt
44+
# touch ${{ github.workspace }}/deploy/dev/secrets/cleo_user.txt
45+
# echo "${{ secrets.DEV_CLEO_USER }}" >> ${{ github.workspace }}/deploy/dev/secrets/cleo_user.txt
46+
# chmod 400 ${{ github.workspace }}/deploy/dev/secrets/cleo_user.txt
47+
# touch ${{ github.workspace }}/deploy/dev/secrets/cleo_pw.txt
48+
# echo "${{ secrets.DEV_CLEO_PW }}" >> ${{ github.workspace }}/deploy/dev/secrets/cleo_pw.txt
49+
# chmod 400 ${{ github.workspace }}/deploy/dev/secrets/cleo_pw.txt
50+
# touch ${{ github.workspace }}/deploy/dev/secrets/cleo_project.txt
51+
# echo "${{ secrets.DEV_CLEO_PROJECT }}" >> ${{ github.workspace }}/deploy/dev/secrets/cleo_project.txt
52+
# chmod 400 ${{ github.workspace }}/deploy/dev/secrets/cleo_project.txt
53+
# touch ${{ github.workspace }}/deploy/dev/secrets/sender_server.txt
54+
# echo "${{ secrets.DEV_SENDER_SERVER }}" >> ${{ github.workspace }}/deploy/dev/secrets/sender_server.txt
55+
# chmod 400 ${{ github.workspace }}/deploy/dev/secrets/sender_server.txt
56+
# touch ${{ github.workspace }}/deploy/dev/secrets/sender_port.txt
57+
# echo "${{ secrets.DEV_SENDER_PORT }}" >> ${{ github.workspace }}/deploy/dev/secrets/sender_port.txt
58+
# chmod 400 ${{ github.workspace }}/deploy/dev/secrets/sender_port.txt
59+
# touch ${{ github.workspace }}/deploy/dev/secrets/sender_replyto.txt
60+
# echo "${{ secrets.DEV_SENDER_REPLYTO }}" >> ${{ github.workspace }}/deploy/dev/secrets/sender_replyto.txt
61+
# chmod 400 ${{ github.workspace }}/deploy/dev/secrets/sender_replyto.txt
62+
# touch ${{ github.workspace }}/deploy/dev/secrets/sender_user.txt
63+
# echo "${{ secrets.DEV_SENDER_USER }}" >> ${{ github.workspace }}/deploy/dev/secrets/sender_user.txt
64+
# chmod 400 ${{ github.workspace }}/deploy/dev/secrets/sender_user.txt
65+
# touch ${{ github.workspace }}/deploy/dev/secrets/sender_pw.txt
66+
# echo "${{ secrets.DEV_SENDER_PW }}" >> ${{ github.workspace }}/deploy/dev/secrets/sender_pw.txt
67+
# chmod 400 ${{ github.workspace }}/deploy/dev/secrets/sender_pw.txt
68+
# touch ${{ github.workspace }}/deploy/dev/secrets/flask_uploader_app_secret_key.txt
69+
# echo "${{ secrets.DEV_FLASK_UPLOADER_APP_SECRET_KEY }}" >> ${{ github.workspace }}/deploy/dev/secrets/flask_uploader_app_secret_key.txt
70+
# chmod 400 ${{ github.workspace }}/deploy/dev/secrets/flask_uploader_app_secret_key.txt
71+
# touch ${{ github.workspace }}/deploy/dev/secrets/uploader_salt.txt
72+
# echo "${{ secrets.DEV_UPLOADER_SALT }}" >> ${{ github.workspace }}/deploy/dev/secrets/uploader_salt.txt
73+
# chmod 400 ${{ github.workspace }}/deploy/dev/secrets/uploader_salt.txt
74+
# touch ${{ github.workspace }}/deploy/dev/secrets/openai_api_key.txt
75+
# echo "${{ secrets.OPENAI_API_KEY }}" >> ${{ github.workspace }}/deploy/dev/secrets/openai_api_key.txt
76+
# chmod 400 ${{ github.workspace }}/deploy/dev/secrets/openai_api_key.txt
77+
# touch ${{ github.workspace }}/deploy/dev/secrets/hf_token.txt
78+
# echo "${{ secrets.HF_TOKEN }}" >> ${{ github.workspace }}/deploy/dev/secrets/hf_token.txt
79+
# chmod 400 ${{ github.workspace }}/deploy/dev/secrets/hf_token.txt
80+
# touch ${{ github.workspace }}/deploy/dev/secrets/pg_password.txt
81+
# echo "${{ secrets.DEV_PG_PASSWORD }}" >> ${{ github.workspace }}/deploy/dev/secrets/pg_password.txt
82+
# chmod 400 ${{ github.workspace }}/deploy/dev/secrets/pg_password.txt
83+
# touch ${{ github.workspace }}/deploy/dev/secrets/grafana_password.txt
84+
# echo "${{ secrets.DEV_GRAFANA_PASSWORD }}" >> ${{ github.workspace }}/deploy/dev/secrets/grafana_password.txt
85+
# chmod 400 ${{ github.workspace }}/deploy/dev/secrets/grafana_password.txt
8486
8587
# create env file to set tag(s) for docker-compose
8688
- name: Create Env File
@@ -100,13 +102,13 @@ jobs:
100102
run: |
101103
rsync -e ssh -r ${{ github.workspace}}/* --exclude .git/ --delete submit06:~/A2rchi-dev/
102104
103-
# run deploy script
104-
- name: Run Deploy Script
105-
run: |
106-
export tag="${GITHUB_REF#refs/heads/}"
107-
export tag="${tag//\//-}.${GITHUB_SHA}"
108-
sed -i "s/BASE_TAG/${tag}/" ${{ github.workspace }}/deploy/dev/dev-install.sh
109-
ssh submit06 'bash -s' < ${{ github.workspace }}/deploy/dev/dev-install.sh
105+
# # run deploy script
106+
# - name: Run Deploy Script
107+
# run: |
108+
# export tag="${GITHUB_REF#refs/heads/}"
109+
# export tag="${tag//\//-}.${GITHUB_SHA}"
110+
# sed -i "s/BASE_TAG/${tag}/" ${{ github.workspace }}/deploy/dev/dev-install.sh
111+
# ssh submit06 'bash -s' < ${{ github.workspace }}/deploy/dev/dev-install.sh
110112

111113
# clean up secret files
112114
- name: Remove Secrets from Runner

‎deploy/create_secret.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/bash
2+
3+
secret_name=$1
4+
secret_file=$2
5+
env=$3
6+
7+
touch ${{ github.workspace }}/deploy/${env}/secrets/${secret_file}
8+
echo "${{ secrets.${secret_name} }}" >> ${{ github.workspace }}/deploy/${env}/secrets/${secret_file}
9+
chmod 400 ${{ github.workspace }}/deploy/${env}/secrets/${secret_file}

‎deploy/dev/dev-install.sh

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,4 @@ echo "Starting docker compose"
3434
docker compose -f dev-compose.yaml up -d --build --force-recreate --always-recreate-deps
3535

3636
# # secrets files are created by CI pipeline and destroyed here
37-
# rm secrets/cleo_*.txt
38-
# rm secrets/imap_*.txt
39-
# rm secrets/sender_*.txt
40-
# rm secrets/flask_uploader_app_secret_key.txt
41-
# rm secrets/uploader_salt.txt
42-
# rm secrets/openai_api_key.txt
43-
# rm secrets/hf_token.txt
37+
# rm secrets/*.txt

0 commit comments

Comments
 (0)