Skip to content

Commit

Permalink
Merge pull request #7 from thanek/docker_image_build
Browse files Browse the repository at this point in the history
Docker image build
  • Loading branch information
thanek authored Oct 19, 2023
2 parents 96481a0 + 90aced9 commit ba2cb2b
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 4 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM eclipse-temurin:17-jdk-focal
FROM eclipse-temurin:17-jdk
WORKDIR /app

COPY ./build/libs/* ./app.jar
COPY ./build/libs/* ./nextcloud-dlna.jar

EXPOSE 8080
CMD ["java","-jar","app.jar"]
CMD ["java","-jar","nextcloud-dlna.jar"]
3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,10 @@ dependencies {
implementation 'org.jupnp:org.jupnp:2.7.1'
implementation 'org.jupnp:org.jupnp.support:2.7.1'
implementation 'org.apache.httpcomponents:httpclient:4.5.14'
// to avoid snakeyaml-1.3 vulnerability CVE-2022-1471
implementation 'org.yaml:snakeyaml:2.2'

testImplementation 'org.apache.groovy:groovy:4.0.15'

testImplementation('org.spockframework:spock-core:2.4-M1-groovy-4.0')
testImplementation('org.spockframework:spock-spring:2.4-M1-groovy-4.0')
testImplementation('org.springframework.boot:spring-boot-starter-test') {
Expand Down
18 changes: 18 additions & 0 deletions docker-build-image.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,28 @@
#!/bin/bash

version=`./gradlew currentVersion | grep "Project version" | awk -F"version: " '{ print $2 }'`

echo "This will create docker image for version $version."
read -p "Continue [y/n]? " -n 1 -r
echo
if [[ ! $REPLY =~ ^[Yy]$ ]]; then
exit
fi

./gradlew clean build || exit

docker buildx create \
--use \
--platform=linux/arm/v7,linux/arm64/v8,linux/amd64 \
--name multi-platform-builder

docker buildx inspect --bootstrap

docker buildx build \
--push \
--platform=linux/arm/v7,linux/arm64/v8,linux/amd64 \
--tag=thanek/nextcloud-dlna:$version .

docker buildx build \
--push \
--platform=linux/arm/v7,linux/arm64/v8,linux/amd64 \
Expand Down

0 comments on commit ba2cb2b

Please sign in to comment.