ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-12 23:35:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5072-remove-image-entries-in-docker-compose-files-fix-m1

Browse Source 
# Conflicts:
#	DOCKER_MORE_CLOSELY.md
#	docker-compose.override.yml
#	docker-compose.test.yml
#	docker-compose.yml
This commit is contained in:
Wolfgang Huß 2022-07-18 19:01:58 +02:00
commit 9143eb7143
7 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/publish.yml vendored
View File

@ -56,9 +56,9 @@ jobs:
# NEO4J ################################################################## # NEO4J ##################################################################
########################################################################## ##########################################################################
- name: Neo4J | Build `community` image - name: Neo4J | Build `community` image
run: docker build --target community -t "ocelotsocialnetwork/neo4j:latest" -t "ocelotsocialnetwork/neo4j:community" -t "ocelotsocialnetwork/neo4j:${VERSION}" -t "ocelotsocialnetwork/neo4j:${BUILD_VERSION}" --build-arg BBUILD_DATE=$BUILD_DATE --build-arg BBUILD_VERSION=$BUILD_VERSION --build-arg BBUILD_COMMIT=$BUILD_COMMIT neo4j/ run: docker build --target community -t "ocelotsocialnetwork/neo4j-community:latest" -t "ocelotsocialnetwork/neo4j-community:${VERSION}" -t "ocelotsocialnetwork/neo4j-community:${BUILD_VERSION}" --build-arg BBUILD_DATE=$BUILD_DATE --build-arg BBUILD_VERSION=$BUILD_VERSION --build-arg BBUILD_COMMIT=$BUILD_COMMIT neo4j/
- name: Neo4J | Save docker image - name: Neo4J | Save docker image
run: docker save "ocelotsocialnetwork/neo4j" > /tmp/neo4j.tar run: docker save "ocelotsocialnetwork/neo4j-community" > /tmp/neo4j.tar
- name: Upload Artifact - name: Upload Artifact
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
@ -238,7 +238,7 @@ jobs:
- name: login to dockerhub - name: login to dockerhub
run: echo "${DOCKERHUB_TOKEN}" | docker login -u "${DOCKERHUB_USERNAME}" --password-stdin run: echo "${DOCKERHUB_TOKEN}" | docker login -u "${DOCKERHUB_USERNAME}" --password-stdin
- name: Push neo4j - name: Push neo4j
run: docker push --all-tags ocelotsocialnetwork/neo4j run: docker push --all-tags ocelotsocialnetwork/neo4j-community
- name: Push backend - name: Push backend
run: docker push --all-tags ocelotsocialnetwork/backend run: docker push --all-tags ocelotsocialnetwork/backend
- name: Push webapp - name: Push webapp

4
.github/workflows/test.yml vendored
View File

@ -43,8 +43,8 @@ jobs:
########################################################################## ##########################################################################
- name: Neo4J | Build `community` image - name: Neo4J | Build `community` image
run: | run: |
docker build --target community -t "ocelotsocialnetwork/neo4j:community" neo4j/ docker build --target community -t "ocelotsocialnetwork/neo4j-community:test" neo4j/
docker save "ocelotsocialnetwork/neo4j:community" > /tmp/neo4j.tar docker save "ocelotsocialnetwork/neo4j-community:test" > /tmp/neo4j.tar
- name: Upload Artifact - name: Upload Artifact
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:

1
backend/Dockerfile
View File

@ -91,6 +91,7 @@ FROM base as production
# Copy "binary"-files from build image # Copy "binary"-files from build image
COPY --from=build ${DOCKER_WORKDIR}/dist ./dist COPY --from=build ${DOCKER_WORKDIR}/dist ./dist
COPY --from=build ${DOCKER_WORKDIR}/node_modules ./node_modules
# Copy static files # Copy static files
# TODO - externalize the uploads so we can copy the whole folder # TODO - externalize the uploads so we can copy the whole folder
COPY --from=build ${DOCKER_WORKDIR}/public/img/ ./public/img/ COPY --from=build ${DOCKER_WORKDIR}/public/img/ ./public/img/

2
docker-compose.override.yml
View File

@ -44,7 +44,7 @@ services:
######################################################## ########################################################
neo4j: neo4j:
# name the image so that it cannot be found in a DockerHub repository, otherwise it will not be built locally from the 'dockerfile' but pulled from there # name the image so that it cannot be found in a DockerHub repository, otherwise it will not be built locally from the 'dockerfile' but pulled from there
image: ocelotsocialnetwork/neo4j:local-development image: ocelotsocialnetwork/neo4j-community:local-development
ports: ports:
# Also expose the neo4j query browser # Also expose the neo4j query browser
- 7474:7474 - 7474:7474

2
docker-compose.test.yml
View File

@ -33,7 +33,7 @@ services:
######################################################## ########################################################
neo4j: neo4j:
# name the image so that it cannot be found in a DockerHub repository, otherwise it will not be built locally from the 'dockerfile' but pulled from there # name the image so that it cannot be found in a DockerHub repository, otherwise it will not be built locally from the 'dockerfile' but pulled from there
image: ocelotsocialnetwork/neo4j:community image: ocelotsocialnetwork/neo4j-community:test
#environment: #environment:
# - NEO4J_dbms_connector_bolt_enabled=true # - NEO4J_dbms_connector_bolt_enabled=true
# - NEO4J_dbms_connector_bolt_tls__level=OPTIONAL # - NEO4J_dbms_connector_bolt_tls__level=OPTIONAL

2
docker-compose.yml
View File

@ -77,7 +77,7 @@ services:
######################################################## ########################################################
neo4j: neo4j:
# name the image so that it cannot be found in a DockerHub repository, otherwise it will not be built locally from the 'dockerfile' but pulled from there # name the image so that it cannot be found in a DockerHub repository, otherwise it will not be built locally from the 'dockerfile' but pulled from there
image: ocelotsocialnetwork/neo4j:local-production image: ocelotsocialnetwork/neo4j-community:local-production
build: build:
context: ./neo4j context: ./neo4j
# community edition 👆🏼, because we have no enterprise licence 👇🏼 at the moment # community edition 👆🏼, because we have no enterprise licence 👇🏼 at the moment

7
webapp/Dockerfile
View File

@ -94,6 +94,13 @@ FROM base as production
COPY --from=build ${DOCKER_WORKDIR}/.nuxt ./.nuxt COPY --from=build ${DOCKER_WORKDIR}/.nuxt ./.nuxt
COPY --from=build ${DOCKER_WORKDIR}/node_modules ./node_modules COPY --from=build ${DOCKER_WORKDIR}/node_modules ./node_modules
COPY --from=build ${DOCKER_WORKDIR}/nuxt.config.js ./nuxt.config.js COPY --from=build ${DOCKER_WORKDIR}/nuxt.config.js ./nuxt.config.js
# Copy static files
# TODO - this seems not be needed anymore for the new rebranding
# TODO - this should be one Folder containign all stuff needed to be copied
COPY --from=build ${DOCKER_WORKDIR}/config/ ./config/
COPY --from=build ${DOCKER_WORKDIR}/constants ./constants
COPY --from=build ${DOCKER_WORKDIR}/static ./static
COPY --from=build ${DOCKER_WORKDIR}/locales ./locales
# Copy package.json for script definitions (lock file should not be needed) # Copy package.json for script definitions (lock file should not be needed)
COPY --from=build ${DOCKER_WORKDIR}/package.json ./package.json COPY --from=build ${DOCKER_WORKDIR}/package.json ./package.json