Switch to docker compose v2 (#25048)
Этот коммит содержится в:
Nicolas Le Cam
коммит произвёл
GitHub
GitHub
родитель
bdb363bd28
Коммит
1ed5d87342
24
.github/workflows/esrupgrade-common.yml
поставляемый
24
.github/workflows/esrupgrade-common.yml
поставляемый
@@ -18,7 +18,7 @@ env:
|
||||
DUMP_SERVER_NAME: esr.${{ inputs.initial-version }}-${{ inputs.final-version }}.dump.server.sql
|
||||
DUMP_SCRIPT_NAME: esr.${{ inputs.initial-version }}-${{ inputs.final-version }}.dump.script.sql
|
||||
MIGRATION_SCRIPT: esr.${{ inputs.initial-version }}-${{ inputs.final-version }}.mysql.up.sql
|
||||
CLEANUP_SCRIPT: esr.${{ inputs.initial-version }}-${{ inputs.final-version }}.mysql.cleanup.sql
|
||||
CLEANUP_SCRIPT: esr.${{ inputs.initial-version }}-${{ inputs.final-version }}.mysql.cleanup.sql
|
||||
PREPROCESS_SCRIPT: esr.common.mysql.preprocess.sql
|
||||
DIFF_NAME: esr.${{ inputs.initial-version }}-${{ inputs.final-version }}.diff
|
||||
jobs:
|
||||
@@ -31,10 +31,10 @@ jobs:
|
||||
- name: Run docker compose
|
||||
run: |
|
||||
cd server/build
|
||||
docker-compose --no-ansi run --rm start_dependencies
|
||||
cat ../tests/test-data.ldif | docker-compose --no-ansi exec -T openldap bash -c 'ldapadd -x -D "cn=admin,dc=mm,dc=test,dc=com" -w mostest';
|
||||
docker-compose --no-ansi exec -T minio sh -c 'mkdir -p /data/mattermost-test';
|
||||
docker-compose --no-ansi ps
|
||||
docker compose --no-ansi run --rm start_dependencies
|
||||
cat ../tests/test-data.ldif | docker compose --no-ansi exec -T openldap bash -c 'ldapadd -x -D "cn=admin,dc=mm,dc=test,dc=com" -w mostest';
|
||||
docker compose --no-ansi exec -T minio sh -c 'mkdir -p /data/mattermost-test';
|
||||
docker compose --no-ansi ps
|
||||
- name: Wait for docker compose
|
||||
run: |
|
||||
until docker network inspect ghactions_mm-test; do echo "Waiting for Docker Compose Network..."; sleep 1; done;
|
||||
@@ -74,7 +74,7 @@ jobs:
|
||||
# otherwise, the name of the container gets written to the console, which is weird
|
||||
docker stop mmserver > /dev/null
|
||||
- name: Cleanup DB
|
||||
run : |
|
||||
run: |
|
||||
cd server/scripts/esrupgrades
|
||||
docker exec -i ghactions_mysql_1 mysql -AN $MYSQL_CONN_ARGS < $CLEANUP_SCRIPT
|
||||
- name: Dump upgraded database
|
||||
@@ -102,10 +102,10 @@ jobs:
|
||||
- name: Run docker compose
|
||||
run: |
|
||||
cd server/build
|
||||
docker-compose --no-ansi run --rm start_dependencies
|
||||
cat ../tests/test-data.ldif | docker-compose --no-ansi exec -T openldap bash -c 'ldapadd -x -D "cn=admin,dc=mm,dc=test,dc=com" -w mostest';
|
||||
docker-compose --no-ansi exec -T minio sh -c 'mkdir -p /data/mattermost-test';
|
||||
docker-compose --no-ansi ps
|
||||
docker compose --no-ansi run --rm start_dependencies
|
||||
cat ../tests/test-data.ldif | docker compose --no-ansi exec -T openldap bash -c 'ldapadd -x -D "cn=admin,dc=mm,dc=test,dc=com" -w mostest';
|
||||
docker compose --no-ansi exec -T minio sh -c 'mkdir -p /data/mattermost-test';
|
||||
docker compose --no-ansi ps
|
||||
- name: Wait for docker compose
|
||||
run: |
|
||||
until docker network inspect ghactions_mm-test; do echo "Waiting for Docker Compose Network..."; sleep 1; done;
|
||||
@@ -119,11 +119,11 @@ jobs:
|
||||
cd server/scripts/esrupgrades
|
||||
docker exec -i ghactions_mysql_1 mysql -AN $MYSQL_CONN_ARGS < $PREPROCESS_SCRIPT
|
||||
- name: Run migration through script
|
||||
run : |
|
||||
run: |
|
||||
cd server/scripts/esrupgrades
|
||||
docker exec -i ghactions_mysql_1 mysql -AN $MYSQL_CONN_ARGS < $MIGRATION_SCRIPT
|
||||
- name: Cleanup DB
|
||||
run : |
|
||||
run: |
|
||||
cd server/scripts/esrupgrades
|
||||
docker exec -i ghactions_mysql_1 mysql -AN $MYSQL_CONN_ARGS < $CLEANUP_SCRIPT
|
||||
- name: Dump upgraded database
|
||||
|
||||
52
.github/workflows/migration.yml
поставляемый
52
.github/workflows/migration.yml
поставляемый
@@ -2,24 +2,24 @@ name: Database Migration Test
|
||||
on:
|
||||
workflow_call:
|
||||
jobs:
|
||||
test:
|
||||
name: MySQL -> Postgres Migration
|
||||
runs-on: ubuntu-22.04
|
||||
env:
|
||||
COMPOSE_PROJECT_NAME: ghactions
|
||||
BUILD_IMAGE: mattermost/mattermost-build-server:20230904_golang-1.20.7
|
||||
defaults:
|
||||
run:
|
||||
working-directory: server
|
||||
steps:
|
||||
test:
|
||||
name: MySQL -> Postgres Migration
|
||||
runs-on: ubuntu-22.04
|
||||
env:
|
||||
COMPOSE_PROJECT_NAME: ghactions
|
||||
BUILD_IMAGE: mattermost/mattermost-build-server:20230904_golang-1.20.7
|
||||
defaults:
|
||||
run:
|
||||
working-directory: server
|
||||
steps:
|
||||
- name: Checkout mattermost project
|
||||
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
|
||||
- name: Run docker compose
|
||||
run: |
|
||||
cd build
|
||||
docker-compose --ansi never run --rm start_dependencies
|
||||
docker-compose --ansi never exec -T minio sh -c 'mkdir -p /data/mattermost-test';
|
||||
docker-compose --ansi never ps
|
||||
docker compose --ansi never run --rm start_dependencies
|
||||
docker compose --ansi never exec -T minio sh -c 'mkdir -p /data/mattermost-test';
|
||||
docker compose --ansi never ps
|
||||
- name: Generate test-data
|
||||
run: |
|
||||
docker run --net ${COMPOSE_PROJECT_NAME}_mm-test \
|
||||
@@ -33,22 +33,22 @@ jobs:
|
||||
make test-data
|
||||
- name: Migrate the DB and compare
|
||||
run: |
|
||||
docker run --net ${COMPOSE_PROJECT_NAME}_mm-test \
|
||||
--ulimit nofile=8096:8096 \
|
||||
--env-file=build/dotenv/migration.env \
|
||||
-v $(go env GOCACHE):/go/cache \
|
||||
-e GOCACHE=/go/cache \
|
||||
-v $PWD:/mattermost \
|
||||
-w /mattermost \
|
||||
$BUILD_IMAGE \
|
||||
make test-migration
|
||||
docker run --net ${COMPOSE_PROJECT_NAME}_mm-test \
|
||||
--ulimit nofile=8096:8096 \
|
||||
--env-file=build/dotenv/migration.env \
|
||||
-v $(go env GOCACHE):/go/cache \
|
||||
-e GOCACHE=/go/cache \
|
||||
-v $PWD:/mattermost \
|
||||
-w /mattermost \
|
||||
$BUILD_IMAGE \
|
||||
make test-migration
|
||||
- name: Upload artifacts
|
||||
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
|
||||
with:
|
||||
name: Migration logs
|
||||
path: server/migration.log
|
||||
retention-days: 7
|
||||
name: Migration logs
|
||||
path: server/migration.log
|
||||
retention-days: 7
|
||||
- name: Stop docker compose
|
||||
run: |
|
||||
cd build
|
||||
docker-compose --ansi never stop
|
||||
docker compose --ansi never stop
|
||||
|
||||
10
.github/workflows/mmctl-test-template.yml
поставляемый
10
.github/workflows/mmctl-test-template.yml
поставляемый
@@ -45,10 +45,10 @@ jobs:
|
||||
- name: Run docker compose
|
||||
run: |
|
||||
cd server/build
|
||||
docker-compose --ansi never run --rm start_dependencies
|
||||
cat ../tests/test-data.ldif | docker-compose --ansi never exec -T openldap bash -c 'ldapadd -x -D "cn=admin,dc=mm,dc=test,dc=com" -w mostest';
|
||||
docker-compose --ansi never exec -T minio sh -c 'mkdir -p /data/mattermost-test';
|
||||
docker-compose --ansi never ps
|
||||
docker compose --ansi never run --rm start_dependencies
|
||||
cat ../tests/test-data.ldif | docker compose --ansi never exec -T openldap bash -c 'ldapadd -x -D "cn=admin,dc=mm,dc=test,dc=com" -w mostest';
|
||||
docker compose --ansi never exec -T minio sh -c 'mkdir -p /data/mattermost-test';
|
||||
docker compose --ansi never ps
|
||||
- name: Run mmctl Tests
|
||||
run: |
|
||||
if [[ ${{ github.ref_name }} == 'master' ]]; then
|
||||
@@ -70,7 +70,7 @@ jobs:
|
||||
- name: Stop docker compose
|
||||
run: |
|
||||
cd server/build
|
||||
docker-compose --ansi never stop
|
||||
docker compose --ansi never stop
|
||||
- name: Archive logs
|
||||
if: ${{ always() }}
|
||||
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
|
||||
|
||||
10
.github/workflows/server-test-template.yml
поставляемый
10
.github/workflows/server-test-template.yml
поставляемый
@@ -37,10 +37,10 @@ jobs:
|
||||
- name: Run docker compose
|
||||
run: |
|
||||
cd server/build
|
||||
docker-compose --ansi never run --rm start_dependencies
|
||||
cat ../tests/test-data.ldif | docker-compose --ansi never exec -T openldap bash -c 'ldapadd -x -D "cn=admin,dc=mm,dc=test,dc=com" -w mostest';
|
||||
docker-compose --ansi never exec -T minio sh -c 'mkdir -p /data/mattermost-test';
|
||||
docker-compose --ansi never ps
|
||||
docker compose --ansi never run --rm start_dependencies
|
||||
cat ../tests/test-data.ldif | docker compose --ansi never exec -T openldap bash -c 'ldapadd -x -D "cn=admin,dc=mm,dc=test,dc=com" -w mostest';
|
||||
docker compose --ansi never exec -T minio sh -c 'mkdir -p /data/mattermost-test';
|
||||
docker compose --ansi never ps
|
||||
- name: Run Tests
|
||||
run: |
|
||||
if [[ ${{ github.ref_name }} == 'master' ]]; then
|
||||
@@ -62,7 +62,7 @@ jobs:
|
||||
- name: Stop docker compose
|
||||
run: |
|
||||
cd server/build
|
||||
docker-compose --ansi never stop
|
||||
docker compose --ansi never stop
|
||||
- name: Archive logs
|
||||
if: ${{ always() }}
|
||||
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
|
||||
|
||||
Ссылка в новой задаче
Block a user