From 7fdc2a5516d740a19b94d8eb2786a5f59c7f99f6 Mon Sep 17 00:00:00 2001 From: weaponsforge Date: Fri, 4 Oct 2024 03:18:20 +0800 Subject: [PATCH] feat: push development images to docker hub, #157 under a single repository (monorepo) --- README.md | 32 +++++++++++++++++++++++--------- docker-compose.dev.yml | 4 ++-- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index c9fcdbb..571b9e1 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,20 @@ email: user@gmail.com password: useruser ``` +### Table of Contents + +- [Online App Demo](#online-app-demo) +- [Using with Google Sites](#using-with-google-sites) + - [A. Embed a File Card](#a-embed-a-file-card) + - [Embed a Full Page Containing a Group of File Cards](#b-embed-a-full-page-containing-a-group-of-file-cards) +- [Requirements](#requirements) +- [Installation](#installation) +- [Run with Docker](#run-with-docker) + - [Build Images Locally](#build-images-locally) + - [Using the Pre-Built Docker Images](#using-the-pre-built-docker-images) +- [Deploy With GitHub Actions](#deploy-with-github-actions) + + ### Using with Google Sites ### A. Embed a File Card @@ -120,21 +134,20 @@ https://sites.google.com/view/gsites-embed-app/full-page docker compose -f docker-compose.prod.yml down ``` -### Using the Pre-Built Docker Image +### Using the Pre-Built Docker Images -This project deploys the latest development Docker imaged to Docker Hub on the creation of new Release/Tags. It is available at:
+This project deploys the latest **client** and **server** development Docker images to Docker Hub on the creation of new Release/Tags. They are available at:
-- **client:** https://hub.docker.com/r/weaponsforge/gsites-client -- **server:** https://hub.docker.com/r/weaponsforge/gsites-server +https://hub.docker.com/r/weaponsforge/gsites-components -1. Pull the pre-built development Docker image using any of the two (2) options: +1. Pull the pre-built development Docker images using any of the two (2) options: - Open a terminal and run:
``` - docker pull weaponsforge/gsites-client:latest - docker pull weaponsforge/gsites-server:latest + docker pull weaponsforge/gsites-components:client + docker pull weaponsforge/gsites-components:server ``` - - Navigate to the gsites-components root project directory, then run:
+ - Navigate to the gsites-components root project directory, then run: `docker compose -f docker-compose.dev.yml pull` 2. Follow the instructions in the README files inside the **/client** and **/server** directories for more information on configuring and using the client and server apps. @@ -219,4 +232,5 @@ git push --set-upstream origin gh-pages @weaponsforge
-20230326 +20230326
+20241004 diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 5c2e939..602aaae 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -2,7 +2,7 @@ services: # NextJS v13 app running on development mode gsites-client-dev: container_name: gsites-client-dev - image: weaponsforge/gsites-client:latest + image: weaponsforge/gsites-components:client env_file: - ./client/.env build: @@ -21,7 +21,7 @@ services: # Node CLI for running scripts gsites-server-dev: container_name: gsites-server-dev - image: weaponsforge/gsites-server:latest + image: weaponsforge/gsites-components:server env_file: - ./server/.env build: