Update galaxy_ng dev env

.github/workflows/cypress.yml

@@ -85,37 +85,23 @@ jobs:
         ref: '${{ env.SHORT_BRANCH }}'
         path: 'galaxy_ng'
 
-    - name: "Checkout oci_env (main)"
-      uses: actions/checkout@v4
-      with:
-        repository: 'pulp/oci_env'
-        path: 'oci_env'
-
-    - name: "Configure oci_env"
-      working-directory: 'oci_env'
-      run: |
-        pip install --editable ./client/
-        # merge common, profile-specific and test matrix specific config
-        cat ../ansible-hub-ui/.github/workflows/cypress/compose.env.common \
-          ../ansible-hub-ui/.github/workflows/cypress/compose.env."$BACKEND_FLAVOR" \
-          ../ansible-hub-ui/test/cypress/e2e/"${{ matrix.test }}"/compose.env \
-          | sed 's/^\s\+//' | tee compose.env || [ -s compose.env ]
-
-    # oci-env compose build: FileNotFoundError: [Errno 2] No such file or directory: 'docker-compose'
+    # docker compose build: FileNotFoundError: [Errno 2] No such file or directory: 'docker-compose'
     - name: "Provide docker-compose"
       run: |
         mkdir -p /home/runner/.local/bin/
         cd /home/runner/.local/bin/
         ( echo '#!/bin/sh' ; echo 'docker compose "$@"' ) > docker-compose
         chmod +x docker-compose
 
-    - name: "oci-env compose build"
-      working-directory: 'oci_env'
-      run: 'oci-env compose build'
+    - name: "galaxy compose build"
+      run: |
+        cd galaxy_ng
+        DEV_SOURCE_PATH=galaxy_ng docker compose -f dev/compose/${{ env.BACKEND_FLAVOR }}.yaml build
 
-    - name: "oci-env compose up"
-      working-directory: 'oci_env'
-      run: 'oci-env compose up &'
+    - name: "galaxy compose up"
+      run: |
+        cd galaxy_ng
+        DEV_SOURCE_PATH=galaxy_ng docker compose -f dev/compose/${{ env.BACKEND_FLAVOR }}.yaml up &
 
     - name: "Install node 20"
       uses: actions/setup-node@v4
@@ -311,8 +297,20 @@ jobs:
 
     - name: "Kill container, show debug info"
       if: always()
-      working-directory: 'oci_env'
       run: |
-        oci-env exec bash -c "pip3 list && pip3 install pipdeptree && pipdeptree"
-        oci-env compose logs
-        oci-env compose kill
+        docker ps -a
+        echo ::group::MANAGER_LOGS
+        docker logs compose-manager-1
+        echo ::endgroup::
+        echo ::group::WORKER_LOGS
+        docker logs compose-worker-1
+        echo ::endgroup::
+        echo ::group::CONTENT_LOGS
+        docker logs compose-content-1
+        echo ::endgroup::
+        echo ::group::API_LOGS
+        docker logs compose-api-1
+        echo ::endgroup::
+        echo ::group::DEPENDENCIES
+        docker exec compose-manager-1 bash -c "pip list && pip install pipdeptree && pipdeptree"
+        echo ::endgroup::

README.md

@@ -11,27 +11,24 @@ The project is built on React & Patternfly, using components from [patternfly-re
 
 ### Backend
 
-The development version of the backend runs in a container, using the [pulp/oci\_env](https://github.com/pulp/oci_env) wrapper.
+The development version of the backend runs in a docker-compose.
 
 Set up:
 
 ```
-git clone https://github.com/pulp/oci_env
 git clone https://github.com/ansible/galaxy_ng
 
-pip install -e oci_env/client/
-oci-env # make sure oci-env is in PATH
 ```
 
 Run:
 
 ```
 cd galaxy_ng
-make oci/dab
+make compose/aap
 ```
 
-The backend can be run in multiple modes - `standalone`, `community`, `insights`, `keycloak`, `ldap` and `dab`.
-Depending on the mode, it will listen on http://localhost:5001 or http://localhost:55001, under `/api/galaxy/`, `/api/` or `/api/automation-hub/`.
+The backend can be run in multiple modes - `standalone`, `community`, `insights`, `certified-sync` and `aap`.
+Depending on the mode, it will listen on http://localhost:5001, under `/api/galaxy/`, `/api/` or `/api/automation-hub/`.
 
 Or, use the [simplified compose stack](https://github.com/ansible/galaxy_ng/tree/master/dev/compose#galaxy-simplified-compose-stack).
 
@@ -64,9 +61,9 @@ This app can be developed in standalone, community, or insights mode. Insights m
 
 #### Modes
 
-* `start-standalone`: assumes `oci/standalone` or `oci/dab`, http://localhost:8002/ui/ and http://localhost:55001/api/galaxy/
-* `start-community`: assumes `oci/community`, http://localhost:8002/ui/ and http://localhost:5001/api/
-* `start-insights`: assumes `oci/insights`,  http://localhost:8002/preview/ansible/automation-hub/ and http://localhost:55001/api/automation-hub/
+* `start-standalone`: assumes `compose/standalone` or `compose/dab`, http://localhost:8002/ui/ and http://localhost:5001/api/galaxy/
+* `start-community`: assumes `compose/community`, http://localhost:8002/ui/ and http://localhost:5001/api/
+* `start-insights`: assumes `compose/insights`,  http://localhost:8002/preview/ansible/automation-hub/ and http://localhost:5001/api/automation-hub/
   * **NOTE:** This option is only relevant to Red Hat employees.
 
 

config/insights.dev.webpack.config.js

@@ -1,12 +1,12 @@
 const { webpackBase } = require('./webpack.base.config');
 
 // Used for getting the correct host when running in a container
-const proxyTarget = process.env.API_PROXY || 'http://localhost:55001';
+const proxyTarget = process.env.API_PROXY || 'http://localhost:5001';
 
 const cloudBeta = process.env.HUB_CLOUD_BETA; // "true" | "false" | undefined (=default)
 
 module.exports = webpackBase({
-  // The host where the API lives. EX: https://localhost:55001
+  // The host where the API lives. EX: https://localhost:5001
   API_HOST: '',
 
   // Path to the API on the API host. EX: /api/automation-hub

config/standalone.dev.webpack.config.js

@@ -4,13 +4,13 @@ const collectionRatings = require('../static/scores/collection.json');
 const roleRatings = require('../static/scores/role.json');
 
 // Used for getting the correct host when running in a container
-const proxyTarget = process.env.API_PROXY || 'http://localhost:55001';
+const proxyTarget = process.env.API_PROXY || 'http://localhost:5001';
 
 const apiBasePath = process.env.API_BASE_PATH || '/api/galaxy/';
 const uiExternalLoginURI = process.env.UI_EXTERNAL_LOGIN_URI || '/login';
 
 module.exports = webpackBase({
-  // The host where the API lives. EX: https://localhost:55001
+  // The host where the API lives. EX: https://localhost:5001
   API_HOST: '',
 
   // Path to the API on the API host. EX: /api/automation-hub

test/cypress.env.json.template

@@ -4,7 +4,7 @@
   "uiPrefix": "/ui/",
   "username": "admin",
   "password": "admin",
-  "containers": "localhost:55001",
+  "containers": "localhost:5001",
   "galaxykit": "galaxykit --ignore-certs"
 }