Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: uselagoon/internal-services-test
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 901e1a10dc918b4787d2539fbd014f48ec86fa27
Choose a base ref
..
head repository: uselagoon/internal-services-test
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dccaa461df13471d6ad8a72a4f680534414bfab0
Choose a head ref
Showing with 10 additions and 20 deletions.
  1. +0 −5 TESTING_dockercompose.md
  2. +7 −12 docker-compose.yml
  3. +1 −1 go.mod
  4. +2 −2 go.sum
5 changes: 0 additions & 5 deletions TESTING_dockercompose.md
Original file line number Diff line number Diff line change
@@ -31,7 +31,6 @@ docker run --rm --net internal-services-test_default jwilder/dockerize dockerize
docker run --rm --net internal-services-test_default jwilder/dockerize dockerize -wait tcp://mongo-4:27017 -timeout 1m
docker run --rm --net internal-services-test_default jwilder/dockerize dockerize -wait tcp://redis-6:6379 -timeout 1m
docker run --rm --net internal-services-test_default jwilder/dockerize dockerize -wait tcp://redis-7:6379 -timeout 1m
docker run --rm --net internal-services-test_default jwilder/dockerize dockerize -wait tcp://solr-7:8983 -timeout 1m
docker run --rm --net internal-services-test_default jwilder/dockerize dockerize -wait tcp://solr-8:8983 -timeout 1m

# commons should be running Alpine Linux
@@ -69,10 +68,6 @@ docker compose exec -T commons sh -c "curl -kL http://go-web:3000/redis?service=
docker compose exec -T commons sh -c "curl -kL http://go-web:3000/redis?service=redis-7" | grep "SERVICE_HOST=redis-7"
docker compose exec -T commons sh -c "curl -kL http://go-web:3000/redis?service=redis-7" | grep "LAGOON_TEST_VAR=internal-services-test"

# solr-7 should be able to read/write data
docker compose exec -T commons sh -c "curl -kL http://go-web:3000/solr?service=solr-7" | grep "SERVICE_HOST=solr-7"
docker compose exec -T commons sh -c "curl -kL http://go-web:3000/solr?service=solr-7" | grep "LAGOON_TEST_VAR=internal-services-test"

# solr-8 should be able to read/write data
docker compose exec -T commons sh -c "curl -kL http://go-web:3000/solr?service=solr-8" | grep "SERVICE_HOST=solr-8"
docker compose exec -T commons sh -c "curl -kL http://go-web:3000/solr?service=solr-8" | grep "LAGOON_TEST_VAR=internal-services-test"
19 changes: 7 additions & 12 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -13,6 +13,9 @@ services:
dockerfile: Dockerfile
labels:
lagoon.type: basic-persistent
lagoon.persistent: /app/files
lagoon.persistent.size: 10Mi
lagoon.persistent.class: bulk
ports:
- '3000:3000'
container_name: go-web
@@ -28,6 +31,7 @@ services:
image: uselagoon/mariadb-10.5:latest
labels:
lagoon.type: mariadb-single
lagoon.persistent.size: 100Mi
ports:
- '3306'

@@ -42,6 +46,7 @@ services:
image: uselagoon/postgres-11:latest
labels:
lagoon.type: postgres-single
lagoon.persistent.size: 100Mi
ports:
- '5432'

@@ -72,6 +77,7 @@ services:
- opensearch-2-data:/usr/share/opensearch/data
labels:
lagoon.type: opensearch
lagoon.persistent.size: 100Mi
ports:
- '9200'

@@ -96,22 +102,11 @@ services:
ports:
- '6379'

solr-7:
image: uselagoon/solr-7:latest
labels:
lagoon.type: solr
ports:
- "8983"
volumes:
- solr-7-data:/var/solr
command:
- solr-precreate
- mycore

solr-8:
image: uselagoon/solr-8:latest
labels:
lagoon.type: solr
lagoon.persistent.size: 100Mi
ports:
- "8983"
volumes:
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ require (
github.com/lib/pq v1.10.9
github.com/opensearch-project/opensearch-go/v3 v3.0.0
github.com/redis/go-redis/v9 v9.4.0
github.com/uselagoon/machinery v0.0.16
github.com/uselagoon/machinery v0.0.17
github.com/vanng822/go-solr v0.10.0
go.mongodb.org/mongo-driver v1.13.1
)
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -34,8 +34,8 @@ github.com/redis/go-redis/v9 v9.4.0 h1:Yzoz33UZw9I/mFhx4MNrB6Fk+XHO1VukNcCa1+lwy
github.com/redis/go-redis/v9 v9.4.0/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M=
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
github.com/uselagoon/machinery v0.0.16 h1:LGWUaESTXPfiTyJTJCC1i+3ghidY2qsf9li7mGbH9Wo=
github.com/uselagoon/machinery v0.0.16/go.mod h1:Duljjz/3d/7m0jbmF1nVRDTNaMxMr6m+5LkgjiRrQaU=
github.com/uselagoon/machinery v0.0.17 h1:rykgkboGvSX+aMa6MPXtR22DJ67eTPC4WITwpVDuj+Y=
github.com/uselagoon/machinery v0.0.17/go.mod h1:Duljjz/3d/7m0jbmF1nVRDTNaMxMr6m+5LkgjiRrQaU=
github.com/vanng822/go-solr v0.10.0 h1:oygAxyFL2apSN8vddxDXoyho40z66Guu9nwH7ANr6wM=
github.com/vanng822/go-solr v0.10.0/go.mod h1:FSglzTPzoNVKTXP+SqEQiiz284cKzcKpeRXmwPa81wc=
github.com/wI2L/jsondiff v0.4.0 h1:iP56F9tK83eiLttg3YdmEENtZnwlYd3ezEpNNnfZVyM=