diff --git a/.gitea/workflows/build-next.yml b/.gitea/workflows/build-next.yml new file mode 100644 index 0000000..26a2f61 --- /dev/null +++ b/.gitea/workflows/build-next.yml @@ -0,0 +1,50 @@ +name: Build and Push Next App + +on: + push: + branches: + - main + paths: + - 'apps/next/**' + - 'packages/ui/**' + - 'scripts/build-next-app' + - 'tools/**' + - 'docker/**' + - '.gitea/workflows/build-next.yml' + +jobs: + build-next: + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Create .env file + run: | + cat > .env <<'EOF' + ${{ secrets.DOTENV_PROD }} + EOF + + - name: Log in to container registry + run: | + echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login git.gbrown.org -u "${{ secrets.REGISTRY_USER }}" --password-stdin + + - name: Build app using project script + run: | + chmod +x ./scripts/build-next-app + ./scripts/build-next-app + + - name: Show built images + run: | + docker images + + - name: Tag built image + run: | + docker tag convexmonorepo-next:latest git.gbrown.org/gib/convexmonorepo-next:${{ gitea.sha }} + docker tag convexmonorepo-next:latest git.gbrown.org/gib/convexmonorepo-next:latest + + - name: Push image tags + run: | + docker push git.gbrown.org/gib/convexmonorepo-next:${{ gitea.sha }} + docker push git.gbrown.org/gib/convexmonorepo-next:latest diff --git a/.gitea/workflows/test-docker.yaml b/.gitea/workflows/test-docker.yaml deleted file mode 100644 index 8061007..0000000 --- a/.gitea/workflows/test-docker.yaml +++ /dev/null @@ -1,15 +0,0 @@ -name: Test Runner - -on: - push: - -jobs: - test: - runs-on: ubuntu-latest - steps: - - run: echo "Hello from Gitea Actions" - - run: uname -a - - run: pwd - - run: ls -la - - run: docker version - - run: docker ps diff --git a/docker/compose.yml b/docker/compose.yml index 30236c7..6baf55c 100644 --- a/docker/compose.yml +++ b/docker/compose.yml @@ -3,11 +3,12 @@ networks: external: true services: - convexmonorepo: + convexmonorepo-next: build: context: ../ dockerfile: ./docker/Dockerfile - image: ${NEXT_CONTAINER_NAME}:alpine + image: ${NEXT_CONTAINER_NAME}:latest + #image: git.gbrown.org/gib/${NEXT_CONTAINER_NAME}:latest container_name: ${NEXT_CONTAINER_NAME} environment: - NODE_ENV @@ -25,7 +26,7 @@ services: domainname: ${NEXT_DOMAIN} networks: ['${NETWORK:-nginx-bridge}'] #ports: ['${NEXT_PORT}:${NEXT_PORT}'] - depends_on: ['convexmonorepo-backend'] + #depends_on: ['convexmonorepo-backend'] tty: true stdin_open: true restart: unless-stopped diff --git a/scripts/build-next-app b/scripts/build-next-app index 24efa83..25348e6 100755 --- a/scripts/build-next-app +++ b/scripts/build-next-app @@ -16,5 +16,4 @@ set -a source "$ENV_FILE" set +a -sudo docker compose --env-file "$ENV_FILE" -f "$COMPOSE_FILE" build "$NEXT_CONTAINER_NAME" -sudo docker compose --env-file "$ENV_FILE" -f "$COMPOSE_FILE" up -d "$NEXT_CONTAINER_NAME" +docker compose --env-file "$ENV_FILE" -f "$COMPOSE_FILE" build "$NEXT_CONTAINER_NAME" diff --git a/scripts/docker-compose b/scripts/docker-compose index 7b651b5..7e31e4d 100755 --- a/scripts/docker-compose +++ b/scripts/docker-compose @@ -43,7 +43,7 @@ for arg in "$@"; do esac done -exec sudo docker compose \ +exec docker compose \ --env-file "$ENV_FILE" \ -f "$COMPOSE_FILE" \ "${translated_args[@]}" diff --git a/scripts/generate-convex-admin-key b/scripts/generate-convex-admin-key index 0492925..4b028e9 100755 --- a/scripts/generate-convex-admin-key +++ b/scripts/generate-convex-admin-key @@ -16,5 +16,5 @@ set -a source "$ENV_FILE" set +a -sudo docker compose --env-file "$ENV_FILE" -f "$COMPOSE_FILE" exec \ +docker compose --env-file "$ENV_FILE" -f "$COMPOSE_FILE" exec \ "$BACKEND_CONTAINER_NAME" ./generate_admin_key.sh diff --git a/scripts/update-convex b/scripts/update-convex index ca2405a..032e94c 100755 --- a/scripts/update-convex +++ b/scripts/update-convex @@ -16,7 +16,7 @@ set -a source "$ENV_FILE" set +a -sudo docker compose --env-file "$ENV_FILE" -f "$COMPOSE_FILE" pull \ +docker compose --env-file "$ENV_FILE" -f "$COMPOSE_FILE" pull \ "$BACKEND_CONTAINER_NAME" "$DASHBOARD_CONTAINER_NAME" -sudo docker compose --env-file "$ENV_FILE" -f "$COMPOSE_FILE" up -d \ +docker compose --env-file "$ENV_FILE" -f "$COMPOSE_FILE" up -d \ "$BACKEND_CONTAINER_NAME" "$DASHBOARD_CONTAINER_NAME" diff --git a/scripts/update-next-app b/scripts/update-next-app index fae7cd5..7f3afce 100755 --- a/scripts/update-next-app +++ b/scripts/update-next-app @@ -16,6 +16,5 @@ set -a source "$ENV_FILE" set +a -git pull -sudo docker compose --env-file "$ENV_FILE" -f "$COMPOSE_FILE" build "$NEXT_CONTAINER_NAME" -sudo docker compose --env-file "$ENV_FILE" -f "$COMPOSE_FILE" up -d "$NEXT_CONTAINER_NAME" +docker compose --env-file "$ENV_FILE" -f "$COMPOSE_FILE" build "$NEXT_CONTAINER_NAME" +docker compose --env-file "$ENV_FILE" -f "$COMPOSE_FILE" up -d "$NEXT_CONTAINER_NAME"