Skip to content

Commit

Permalink
Merge pull request #54 from conorheffron/dev
Browse files Browse the repository at this point in the history
2.2.0
  • Loading branch information
conorheffron authored Mar 28, 2024
2 parents 5ba2162 + 79f6557 commit 1e779dd
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 7 deletions.
18 changes: 18 additions & 0 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Docker Image CI

on:
push:
branches: [ "dev" ]
pull_request:
branches: [ "dev" ]

jobs:

build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Build the Docker image
run: docker build . --file Dockerfile --tag my-image-name:$(date +%s)
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM eclipse-temurin:8-jdk

VOLUME /tmp
ADD target/*.war app.war
ADD *.war app.war
RUN sh -c 'touch /app.war'

ENTRYPOINT [ "sh", "-c", "java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /app.war" ]
ENTRYPOINT [ "sh", "-c", "java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /app.war" ]
3 changes: 0 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,3 @@ docker remove test-mysql

# Screenshots
![Home](./screenshots/DBManager.png?raw=true "Home Page")

# TODO
Create docker compose file to spin up both MySql and ironoc-db.
4 changes: 2 additions & 2 deletions src/main/webapp/static/style/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
}

#navbar {
background-color: #A8CD1B;
}
background-color: #a8cd1b;
}

0 comments on commit 1e779dd

Please sign in to comment.