From c7eb02b7cbc2fcd967b4390c1b8a26b20e865447 Mon Sep 17 00:00:00 2001 From: Ktosi33 <54289137+Ktosi33@users.noreply.github.com> Date: Sun, 19 Nov 2023 12:28:53 +0100 Subject: [PATCH 1/3] feat: added docker-compose for main infrastruacture and docs The following commit adds docker-compose.yml, which defines the application infrastructure and documentation information on how to run the applications --- README.md | Bin 9230 -> 14204 bytes docker-compose.yml | 70 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+) create mode 100644 docker-compose.yml diff --git a/README.md b/README.md index 8fe947539e8c3a5189b7d4e55fe5ec0fcd6f3ae6..c95d2d19c06a8717a204930e58b5e87bde397863 100644 GIT binary patch delta 4596 zcmbW4NpBog6op?2Ss@XVWd|ulkV-5dmJ(ZG*suXi!W1AACP?1UQxe-fsRuPSmP$z3 zuwhdhB>n^vYc~8Hmf5o4eE0TqRafjzf-HBxe)ZlR&OLXiUqAo1`^Rr5udjrakcQ1L z2;h`n{>%g3lYomaJ)qCu9 z&CF~VCbD!}X1L8AVK_Fs@v0RrY2STD6wh|Fvmfs3R@2M|3((>e-XA26GOI|5 z-yc{+hzhY>327Ft1bp~HSMj)}0DAC1V>SR+WzNv>=t&tu`2SM7TM1#uC+Lt$Rn0=3 z%2@8~E4(=4;R55RE9=RB;BT2n^HqXHT__M~6d@R8W37n#h5_!Z!0Wnp2|`~OpuVZo zl^}hjZMT{LRO7U5*vvyA&3}LSYz7&@EtMgA=37f)k6&4;=;Nw|?dGNOAJAL!Re&J8ogbzOfG`&%<*F`w2X6gsXO3UG$p z9ZA&s%(=_@RSxg^VSq1&uO;CiiFgmpF$e8H=ng~v_ZzR?O2ch=(3S895=0`;@&(Vy zrAK;3E;%zsTEQlwfT*4YsG;9!{?DnmGZMFud08j;-Bf6M!f#!&W}jD`7)VlE|L_q9 zoI+MCWIB;4s7FB|8QaBPCIvkOV4|bcB$TmQJw%5?M}6g@<@EhvPs$i;ZBD8OwgrBuRzJ^cUPetKE#DGBkCbUexr zudoH^KLq|Lk@uw*qBkTMM5g4v20m>wt!}#`5&FK=cXZ;izWchjHoc9UhKNrom^qRE zvV1ms*8;mKyN>S6xcw|`%?q_hv?D7U0=rt9OZ_;L!Lc9Q)bU7#$T46$3NquE&T|e} z|8K%1{rvptrL39;)c)f=hmX~QPh-Z2r}kWq(>^UXUed)9Rr1B>m(C*&{_QAq<)#$} zr8K{?crJr$ZL3Y?3W*^w79L}gGyk4;AR>DVS(xlkieZP&QxK63O~vpYjns~AbQRJK z?QSK?@@leRwqsEAPLeBj={QvoSPBM3d?ck5_o7`f62$ukfJ~*xVsII%WDHgfG8{j_ zi%!S5<4Va?1bG1!k`h!t6{`Ux^}<0dXi9>2%EMF?+OOvim(x4%Jt1ML#K0A*%69@` zDDhkdDGvke!kgIoRR?8wO zJz%tXAEBQFU_sc}rhICfWe(DYa-T{{3V6GMHiMvH(p&XH0?V%ogNuq0MV678C^2PR z)8r5ZkXx(T19c}W_|f2e+9D>-!NNQ*w$~+Va zG9cCKGR1jC2N zO4EYLJbmZA&Kt>{Pxnq4uyq2OJIo@sXq>yM7_0=gN%S2tyT$YvCkgN zxIPMzeJ!oWs@lZ>ShMU!RU`;m=o8JZnB`gQLH{(o&m;zk>#_ytFq+F0 z<$=1b`&}bD6`DfQ)y}+@ZEDR&b$f$lX!WyakUUDzI^UWh*NYULEOZm%ySn;N~7{|72ZCJ z#u~%qy`A>Cm1N#M%Wt+&5Z}1oHcwbb0@k%h%0pKGuPX8Gyd%|>h21MwP4Lf^ urukxedehmtm5^lq`r_3F|A#iSP4re=ll{=lhY6lkjhXTI&-~<1ul)!6l}+3L delta 12 Tcmey9*XOZe2Ipor*)k~rCwv6> diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..83d3b64 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,70 @@ +version: "3" +services: + postgresdb: + image: postgres + container_name: postgresdb + restart: always + ports: + - ${POSTGRES_PORT}:5432 + environment: + POSTGRES_USER: ${POSTGRES_USER} + POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} + volumes: + - pgdata:/var/lib/postgresql/data + networks: + - postgresdb-network + pgadmin: + image: dpage/pgadmin4 + container_name: pgadmin4 + restart: always + ports: + - ${PGADMIN_PORT}:80 + environment: + PGADMIN_DEFAULT_EMAIL: ${PGADMIN_EMAIL} + PGADMIN_DEFAULT_PASSWORD: ${PGADMIN_PASSWORD} + volumes: + - pgadmin-data:/var/lib/pgadmin + networks: + - postgresdb-network + redis: + image: redis:latest + container_name: redis + command: redis-server --requirepass ${REDIS_PASSWORD} + restart: always + volumes: + - redis:/var/lib/redis + - redis-config:/usr/local/etc/redis/redis.conf + ports: + - ${REDIS_PORT}:6379 + networks: + - redis-network + + redis-commander: + image: rediscommander/redis-commander:latest + container_name: redis-commander + restart: always + depends_on: + - redis + environment: + REDIS_HOSTS: redis + REDIS_HOST: redis + REEDIS_PORT: redis:6379 + REDIS_PASSWORD: ${REDIS_PASSWORD} + HTTP_USER: ${REDIS_HTTP_USER} + HTTP_PASSWORD: ${REDIS_HTTP_PASSWORD} + ports: + - ${REDISCOMMANDER_PORT}:8081 + networks: + - redis-network + +volumes: + pgdata: + pgadmin-data: + redis: + redis-config: + +networks: + postgresdb-network: + driver: bridge + redis-network: + driver: bridge From e6b2705b81a5ca4c6372b57e2fae4c8e1b6dbe56 Mon Sep 17 00:00:00 2001 From: Ktosi33 <54289137+Ktosi33@users.noreply.github.com> Date: Sun, 19 Nov 2023 12:38:21 +0100 Subject: [PATCH 2/3] docs: add management section --- README.md | Bin 14204 -> 15120 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/README.md b/README.md index c95d2d19c06a8717a204930e58b5e87bde397863..cc883c2e1d4d9ee0cd57602adc630e58639709e0 100644 GIT binary patch delta 845 zcmbtSOG*Pl5Pj_j!Oud5h(B;Px)2E_h)6)tsHmVQintPHOhOVeGl@wik`TxdBJ>H| zx-sYpJcEbu0B&9Qs-yVJPMU6-s#mXGecpnbTBlbg-sMUz2JCT8G zgP02OE|SVdh%#>qIa+-RDI!3f@g-y_Ep2Q8R%j^_>7v2k3Axk6R`}mCaXvi(Z5d)D zmYVeKl;sPfO<$V!4DnKQ9tn(L7>fq^GmF^eO6G1v7wbTdcsz2a$m1EsQbz)7SmurC zr*TW)EsVB)$L!#cjQcpiI$4W6RcsiQp7aQp978~TRg>YE*i)W!9I?{vZ!wbpONr?3 z*@?Yxt@uwt@y~+xe;0H{c{@xl<$R7pGX0faVyh}VvKVC!Wjq#Xg=X{0A7d7K6|Y1r zv7mtX2LG}GA)2aAUw5$r4z6Huwi#;9FejBuq)+yyl33g5ktkV47eibzS;rC^E%71j lIC~f+EI^IFuDd{}Y@|##D Date: Sun, 19 Nov 2023 12:46:21 +0100 Subject: [PATCH 3/3] feat: update workflow file to restore .NET 8 --- .github/workflows/pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 97cad07..de59c0c 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -11,7 +11,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v3 with: - dotnet-version: 7.0.x + dotnet-version: 8.0.x - name: Check Formatting run: |