Skip to content

Commit

Permalink
refactor: assign project name
Browse files Browse the repository at this point in the history
  • Loading branch information
DelanoWAF committed Apr 5, 2024
1 parent 097249a commit 1223912
Show file tree
Hide file tree
Showing 10 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .releaserc
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"assets": [
"CHANGELOG.md",
"src/main/resources/BuildInfo.properties",
"configurations/{{ cookiecutter.configuration_name }}/BuildInfo.properties",
"configurations/morcore2ultimo/BuildInfo.properties",
"publiccode.yaml"
],
"message": "chore(<%= nextRelease.type %>): release <%= nextRelease.version %> <%= nextRelease.channel !== null ? `on ${nextRelease.channel} channel ` : '' %>[skip ci]\n\n<%= nextRelease.notes %>"
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ Here is a checklist for testing the CI/CD.
* Do a commit on main that has a commit message starting with `fix:`. The following should happen:
* The pipeline succeeds - this checks all authorizations are in place.
* A commit with a message starting with `chore:` has been added automatically.
* The extra commit updates files `src/main/resources/BuildInfo.properties`, `configurations/{{ cookiecutter.configuration_name }}/BuildInfo.properties`, `publiccode.yaml` and `CHANGELOG.md`.
* The extra commit updates files `src/main/resources/BuildInfo.properties`, `configurations/morcore2ultimo/BuildInfo.properties`, `publiccode.yaml` and `CHANGELOG.md`.
* These files should have trustworthy contents - speaks for itself.
* On GitHub, there is a tag for the new version that starts with `v`. For example if the new release is `3.2.1` then the tag should be `v3.2.1`. You can get this tag using `git fetch origin` on the command line.
* The docker image for the release has been created on http://www.dockerhub.com. The `latest` tag should have been updated - creation time should be the current time. Depending on the type of release, the `3.2.1`, the `3.2` or the `3` tags should be the current date.
* Check on dockerhub that tags that should not have been updated do not have the current time as creation time.
* Run the docker image using `docker run -p 8080:8080 wearefrank/{{ cookiecutter.configuration_name }}:3.2.1`. Check the name of the docker container you started using `docker ps -a`. Login to the docker container using `docker exec -it <container name> bash`. Check that `/opt/frank/resources/BuildInfo.properties` and `/opt/frank/configurations/{{ cookiecutter.configuration_name }}/BuildInfo.properties` contain the right version and the right date.
* Run the docker image using `docker run -p 8080:8080 wearefrank/morcore2ultimo:3.2.1`. Check the name of the docker container you started using `docker ps -a`. Login to the docker container using `docker exec -it <container name> bash`. Check that `/opt/frank/resources/BuildInfo.properties` and `/opt/frank/configurations/morcore2ultimo/BuildInfo.properties` contain the right version and the right date.
* Check a breaking change like above. This should update the major version.
* Do a commit with \[skip ci\] in the commit message. It should not make a release and it should not push a docker image.
* Make a pull request. Check that no release is made and that no docker image is pushed.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# {{ cookiecutter.instance_name }}
# morcore2ultimo

Project for Frank applications deployed by JAR or Docker

Expand Down Expand Up @@ -43,6 +43,6 @@ Please check if you deem all these functionalities necessary, if not remove them

| Template variable | Description | Example |
|-------------------------------|------------------------------------------------------------------------------------------------|----------------|
| `{{ cookiecutter.instance_name }}` | The name of the Frank! to be deployed. It's best to keep this inline with the name of the repo | Frank2Skeleton |
| `{{ cookiecutter.instance_name_lc }}` | Lowercase version of the instance name. | frank2example |
| `{{ cookiecutter.configuration_name }}` | The name of the first configuration (others have to be added manually) | Sans |
| `morcore2ultimo` | The name of the Frank! to be deployed. It's best to keep this inline with the name of the repo | Frank2Skeleton |
| `morcore2ultimo` | Lowercase version of the instance name. | frank2example |
| `morcore2ultimo` | The name of the first configuration (others have to be added manually) | Sans |
4 changes: 2 additions & 2 deletions build.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<project default="restart-{{ cookiecutter.instance_name }}">
<target name="restart-{{ cookiecutter.instance_name }}">
<project default="restart-morcore2ultimo">
<target name="restart-morcore2ultimo">
<basename property="project.dir" file="${basedir}"/>
<condition property="exe" value="../frank-runner/restart.bat" else="/bin/bash">
<os family="windows"/>
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: '3.8'
services:
frank:
build: .
image: wearefrank/{{ cookiecutter.instance_name_lc }}:${VERSION:-latest}
image: wearefrank/morcore2ultimo:${VERSION:-latest}
ports:
- "${PORT:-8080}:8080"
environment:
Expand Down
8 changes: 4 additions & 4 deletions publiccode.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
publiccodeYmlVersion: "0.2"
# Instructies: https://github.com/OpenCatalogi/OpenCatalogiBundle/blob/main/docs/Publiccode.md
name: {{ cookiecutter.instance_name }}
url: "https://github.com/wearefrank/{{ cookiecutter.instance_name }}.git"
name: morcore2ultimo
url: "https://github.com/wearefrank/morcore2ultimo.git"
softwareVersion: "6.7.5" # Optional
releaseDate: 2023-08-14
applicationSuite: frankframework
Expand All @@ -20,10 +20,10 @@ softwareType: "standalone/other"
description:
en:
shortDescription: >
The {{ cookiecutter.instance_name }} component is an integration component.
The morcore2ultimo component is an integration component.
longDescription: >
The {{ cookiecutter.instance_name }} component is an integration component.
The morcore2ultimo component is an integration component.
features:
- Statelessness
Expand Down
8 changes: 4 additions & 4 deletions publiccode_template.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
publiccodeYmlVersion: "0.2"
# Instructies: https://github.com/OpenCatalogi/OpenCatalogiBundle/blob/main/docs/Publiccode.md
name: {{ cookiecutter.instance_name }}
url: "https://github.com/wearefrank/{{ cookiecutter.instance_name }}.git"
name: morcore2ultimo
url: "https://github.com/wearefrank/morcore2ultimo.git"
softwareVersion: "${instance_version}" # Optional
releaseDate: ${versionDate_yyyymmdd}
applicationSuite: frankframework
Expand All @@ -20,10 +20,10 @@ softwareType: "standalone/other"
description:
en:
shortDescription: >
The {{ cookiecutter.instance_name }} component is an integration component.
The morcore2ultimo component is an integration component.
longDescription: >
The {{ cookiecutter.instance_name }} component is an integration component.
The morcore2ultimo component is an integration component.
features:
- Statelessness
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

]>

<Configuration name="{{ cookiecutter.configuration_name }}">
<Configuration name="morcore2ultimo">

</Configuration>
6 changes: 3 additions & 3 deletions src/main/resources/DeploymentSpecifics.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
instance.name={{ cookiecutter.instance_name }}
configurations.names={{ cookiecutter.configuration_name }}
instance.name=morcore2ultimo
configurations.names=morcore2ultimo
classloader.type=DirectoryClassLoader
configurations.{{ cookiecutter.configuration_name }}.classLoaderType=DirectoryClassLoader
configurations.morcore2ultimo.classLoaderType=DirectoryClassLoader

# Disable output streaming (seems not to be disabled by default in 7.9-SNAPSHOT (in 7.8 it is))
streaming.auto=false
Expand Down
6 changes: 3 additions & 3 deletions src/main/webapp/META-INF/context.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
<JarScanner scanClassPath="false" scanAllFiles="false" scanAllDirectories="false"/>

<Resource
name="jdbc/{{ cookiecutter.instance_name_lc }}"
name="jdbc/morcore2ultimo"
type="org.h2.jdbcx.JdbcDataSource"
factory="org.apache.naming.factory.BeanFactory"
URL="jdbc:h2:/opt/frank/h2/{{ cookiecutter.instance_name_lc }}"
URL="jdbc:h2:/opt/frank/h2/morcore2ultimo"
/>

<Resource
name="jdbc/{{ cookiecutter.instance_name_lc }}-postgresql"
name="jdbc/morcore2ultimo-postgresql"
auth="Container"
factory="org.apache.naming.factory.BeanFactory"
type="org.postgresql.xa.PGXADataSource"
Expand Down

0 comments on commit 1223912

Please sign in to comment.