Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: 🍰 Implement Use Of package.json 'Version' Etc. For Build And Refine Helm Chart #8

Merged
merged 12 commits into from
May 15, 2021

Conversation

Tirokk
Copy link
Member

@Tirokk Tirokk commented May 11, 2021

πŸ›  Refactor

Implement use of package.json 'version' etc. for '$ docker build β€¦β€˜

Fixes #7

Todo

Docker image building

  • use package.json version and build-number to select the ocelot.social version
    • Neo4j
    • backend
    • webapp
    • maintenance
  • same for the Docker organisations as source and to push to
    • Neo4j
    • backend
    • webapp
    • maintenance
  • add Neo4j to the Docker images

Helm Deployment

  • set ocelot.social version
    • is set with the charts appVersion
  • set Docker source organisation
    • is set with the values of each apps DOCKER_IMAGE_REPO
    • may this can be more centralised and not separate for all images? But not sure this is necessary …
  • pull correct Neo4j image (community)

Open questions

  • has the Chart.Version to be changed?

For Curiosity

  • why a values.yaml.dist instead just values.yaml?

@Tirokk Tirokk self-assigned this May 11, 2021
@Tirokk Tirokk added the devOps label May 11, 2021
@Tirokk Tirokk marked this pull request as draft May 11, 2021 14:07
@Tirokk Tirokk requested a review from ulfgebhardt May 11, 2021 14:07
@Tirokk
Copy link
Member Author

Tirokk commented May 11, 2021

Do I have to merge or push this to master to test? @ulfgebhardt

@Tirokk Tirokk changed the title chore: [WIP] 🍰 Implement Use Of package.json 'Version' Etc. For Build chore: [WIP] 🍰 Implement Use Of package.json 'Version' Etc. For Build And Refine Helm Chart May 11, 2021
deployment/kubernetes/Chart.yaml Outdated Show resolved Hide resolved
.github/workflows/publish.yml Outdated Show resolved Hide resolved
@ulfgebhardt
Copy link
Member

Do I have to merge or push this to master to test? @ulfgebhardt

To test you can change the on: condition on top of the file. E.g. remove the branch: master condition so it runs on every branch

@Tirokk
Copy link
Member Author

Tirokk commented May 12, 2021

Yeah. To change the on condition I was the idea I was woken up with this morning. πŸ˜„

@Tirokk Tirokk changed the title chore: [WIP] 🍰 Implement Use Of package.json 'Version' Etc. For Build And Refine Helm Chart chore: 🍰 Implement Use Of package.json 'Version' Etc. For Build And Refine Helm Chart May 14, 2021
@Tirokk Tirokk marked this pull request as ready for review May 14, 2021 10:29
@Tirokk Tirokk requested a review from ulfgebhardt May 14, 2021 10:29
@ulfgebhardt
Copy link
Member

image

Job requirement not correct:

needs: [build_branded_backend,build_branded_webapp,build_branded_maintenance]
needs: [build_production_neo4j,build_branded_backend,build_branded_webapp,build_branded_maintenance]

See

needs: [build_branded_backend,build_branded_webapp,build_branded_maintenance]

@Tirokk
Copy link
Member Author

Tirokk commented May 14, 2021

Good seen @ulfgebhardt πŸ‘πŸΌ

deployment/kubernetes/values.template.yaml Show resolved Hide resolved
deployment/kubernetes/values.template.yaml Show resolved Hide resolved
deployment/kubernetes/values.template.yaml Show resolved Hide resolved

# Copy public constants to the docker image branding it
# Copy public constants to the docker image and branding it
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# Copy public constants to the docker image and branding it
# Copy public constants to the docker image branding it

Copy link
Member

@ulfgebhardt ulfgebhardt May 14, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

... to the docker image branding it
... in das docker image um es zu branden
or
... to the docker image and brand it
... in das docker image und brande es

I use the first because it describes that when you copy stuff like this to the docker image it becomes branded that way. The second sentence indicates that the copying and the branding are two separate processes which are done independently.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, okay πŸ‘πŸΌ
I’ll do later

Copy link
Member Author

@Tirokk Tirokk May 14, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would suggest:
kopiere ΓΆffentliche Konstanten in das Docker-Image, um es zu brandmarken (brandmarken is the closest in german πŸ˜‚)
copy public constants into the Docker image to brand it (says Deepl)


# Copy public constants to the docker image branding it
# Copy public constants to the docker image and branding it
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# Copy public constants to the docker image and branding it
# Copy public constants to the docker image branding it

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same same @ulfgebhardt


# Copy public constants to the docker image branding it
# Copy public constants to the docker image and branding it
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# Copy public constants to the docker image and branding it
# Copy public constants to the docker image branding it

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same same @ulfgebhardt

@Tirokk
Copy link
Member Author

Tirokk commented May 14, 2021

I refined some of the comments and the default Docker image names I've seen now to be not perfect. @ulfgebhardt

In the comments with # label is appended based on .Chart.appVersion I left the two-spaced indent, because you did it right by indicating that this line belongs to the comment above, in my opinion.

Copy link
Member

@ulfgebhardt ulfgebhardt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

<3 awesome!

@Tirokk Tirokk merged commit e587f88 into master May 15, 2021
ulfgebhardt pushed a commit that referenced this pull request Dec 6, 2022
chore: [WIP] 🍰 Refine Rebanding And Deployment
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

πŸ›  Refactor Build Of Docker Image And Deployment To Prepare For wir.social And sender.fm
2 participants