Skip to content

Commit

Permalink
Remove identity migration from docker (#58)
Browse files Browse the repository at this point in the history
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/DocSpace-buildtools/pulls/58
Co-authored-by: Valeria Bagisheva <valeriya.bagisheva@onlyoffice.com>
Co-committed-by: Valeria Bagisheva <valeriya.bagisheva@onlyoffice.com>
  • Loading branch information
lemmav authored and agolybev committed Nov 2, 2024
1 parent 06ce763 commit e7af7af
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 45 deletions.
2 changes: 0 additions & 2 deletions install/docker/.env
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,6 @@

# identity #
IDENTITY_PROFILE="dev"
IDENTITY_MIGRATION_CONTAINER_NAME=${CONTAINER_PREFIX}identity-migration
IDENTITY_MIGRATION_SERVER_PORT=8081
IDENTITY_AUTHORIZATION_CONTAINER_NAME=${CONTAINER_PREFIX}identity-authorization
IDENTITY_AUTHORIZATION_SERVER_PORT=8080
IDENTITY_API_CONTAINER_NAME=${CONTAINER_PREFIX}identity-api
Expand Down
6 changes: 0 additions & 6 deletions install/docker/Dockerfile.app
Original file line number Diff line number Diff line change
Expand Up @@ -396,12 +396,6 @@ WORKDIR ${BUILD_PATH}/services/ASC.Identity.Registration/
COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.Identity.Registration/service/ .
CMD ["ASC.Identity.Registration"]

## ASC.Identity.Migration ##
FROM javarun AS identity-migration
WORKDIR ${BUILD_PATH}/services/ASC.Identity.Migration/
COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.Identity.Migration/service/ .
CMD ["ASC.Identity.Migration"]

## image for k8s bin-share ##
FROM busybox:latest AS bin_share
RUN mkdir -p /app/ASC.Files/server && \
Expand Down
17 changes: 0 additions & 17 deletions install/docker/build-identity.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ services:
SPRING_PROFILES_ACTIVE: dev
SPRING_APPLICATION_NAME: ASC.Identity.Authorization
SERVER_PORT: 8080
depends_on:
- onlyoffice-identity-migration

onlyoffice-identity-api:
build:
Expand All @@ -43,21 +41,6 @@ services:
SPRING_PROFILES_ACTIVE: dev
SPRING_APPLICATION_NAME: ASC.Identity.Registration
SERVER_PORT: 9090
depends_on:
- onlyoffice-identity-migration

onlyoffice-identity-migration:
build:
<<: *x-build
args:
- MODULE=infrastructure/infrastructure-migration-runner
image: "${HUB}${REPO}/${DOCKER_IMAGE_PREFIX}-identity-migration:${DOCKER_TAG}"
container_name: ${IDENTITY_MIGRATION_CONTAINER_NAME}
restart: "no"
ports:
- 8081:8081
environment:
<<: *x-common-environment

networks:
default:
Expand Down
6 changes: 0 additions & 6 deletions install/docker/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,3 @@ services:
target: identity-api
image: "${REPO}/${DOCKER_IMAGE_PREFIX}-identity-api:${DOCKER_TAG}"

onlyoffice-identity-migration:
build:
context: ./
dockerfile: "${DOCKERFILE}"
target: identity-migration
image: "${REPO}/${DOCKER_IMAGE_PREFIX}-identity-migration:${DOCKER_TAG}"
14 changes: 0 additions & 14 deletions install/docker/identity.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ services:
test: curl --fail ${SERVICE_IDENTITY}/health/ || exit 1
volumes:
- log_data:/var/log/onlyoffice
depends_on:
- onlyoffice-identity-migration

onlyoffice-identity-api:
image: "${HUB}${REPO}/${DOCKER_IMAGE_PREFIX}-identity-api:${DOCKER_TAG}"
Expand All @@ -58,18 +56,6 @@ services:
test: curl --fail ${SERVICE_IDENTITY_API}/health/ || exit 1
volumes:
- log_data:/var/log/onlyoffice
depends_on:
- onlyoffice-identity-migration

onlyoffice-identity-migration:
image: "${HUB}${REPO}/${DOCKER_IMAGE_PREFIX}-identity-migration:${DOCKER_TAG}"
container_name: ${IDENTITY_MIGRATION_CONTAINER_NAME}
user: "${UID}:${GID}"
restart: on-failure
expose:
- "${IDENTITY_MIGRATION_SERVER_PORT}"
environment:
<<: *x-common-environment

networks:
default:
Expand Down

0 comments on commit e7af7af

Please sign in to comment.