Skip to content

Commit adf7c25

Browse files
committed
Add Docker changes
Add multistage Docker Add fixes for Microbadger
1 parent dbab181 commit adf7c25

10 files changed

+67
-55
lines changed

.dockerignore

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
.git
2+
.DS_Store/
3+
.vscode/
4+
.idea
5+
.mvn
6+
.settings

.env

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
DOCKER_IMAGE_NAME=slydeveloper/spring-boot-admin
2+
DOCKER_IMAGE_VERSION=1.1

.gitignore

+4-1
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,7 @@
2222
/nbbuild/
2323
/dist/
2424
/nbdist/
25-
/.nb-gradle/
25+
/.nb-gradle/
26+
27+
.DS_Store/
28+
.vscode/

Dockerfile

+30-11
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,35 @@
1-
FROM java:8-jre-alpine
2-
3-
MAINTAINER Sylwester Sokolowski <[email protected]>
4-
5-
RUN apk add --no-cache curl
6-
7-
COPY target/spring-boot-admin-docker-*.jar /opt/spring-boot-admin-docker/app.jar
1+
# build stage
2+
FROM maven:3.6.3-jdk-8-slim AS build-stage
3+
LABEL maintainer="[email protected]"
84

9-
COPY application-docker.properties /opt/spring-boot-admin-docker/application-docker.properties
5+
COPY pom.xml /tmp/
6+
COPY src /tmp/src/
7+
WORKDIR /tmp/
8+
RUN mvn clean package
109

11-
EXPOSE 1111
10+
# run stage
11+
FROM java:8-jre-alpine
12+
LABEL maintainer="[email protected]"
13+
14+
ARG BUILD_DATE
15+
ARG BUILD_NAME
16+
ARG BUILD_VERSION
17+
ARG VCS_REF
18+
19+
LABEL org.label-schema.schema-version="1.0"
20+
LABEL org.label-schema.build-date=$BUILD_DATE
21+
LABEL org.label-schema.name=$BUILD_NAME
22+
LABEL org.label-schema.description="Spring Boot Admin Docker"
23+
LABEL org.label-schema.url="https://github.com/slydeveloper/spring-boot-admin-docker"
24+
LABEL org.label-schema.vcs-url="https://github.com/slydeveloper/spring-boot-admin-docker"
25+
LABEL org.label-schema.vcs-ref=$VCS_REF
26+
LABEL org.label-schema.vendor="Sylwester Sokolowski"
27+
LABEL org.label-schema.version=$BUILD_VERSION
28+
LABEL org.label-schema.docker.cmd="docker run -d -p 1111:1111 --name spring-boot-admin slydeveloper/spring-boot-admin"
1229

30+
RUN apk add --no-cache curl
31+
COPY --from=build-stage /tmp/target/*.jar /opt/spring-boot-admin-docker/app.jar
1332
WORKDIR /opt/spring-boot-admin-docker
33+
EXPOSE 1111
1434

15-
ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Dspring.profiles.active=docker","-jar","app.jar"]
16-
35+
ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Dspring.profiles.active=docker","-jar","app.jar"]

docker-container-run.sh

-10
This file was deleted.

docker-image-build.sh

-12
This file was deleted.

docker-image-publish.sh

-21
This file was deleted.

docker_build.sh

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#!/bin/bash
2+
3+
source .env
4+
echo Building image: $DOCKER_IMAGE_NAME
5+
6+
docker rmi -f $(docker images | grep "<none>" | awk "{print \$3}")
7+
docker build --no-cache=true \
8+
--build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
9+
--build-arg BUILD_NAME=$DOCKER_IMAGE_NAME \
10+
--build-arg BUILD_VERSION=$DOCKER_IMAGE_VERSION \
11+
--build-arg VCS_REF=$(git rev-parse HEAD) \
12+
-t $DOCKER_IMAGE_NAME .
13+
14+
docker tag $DOCKER_IMAGE_NAME:latest $DOCKER_IMAGE_NAME:$DOCKER_IMAGE_VERSION
15+
docker inspect $DOCKER_IMAGE_NAME
16+
docker images $DOCKER_IMAGE_NAME

docker_build_and_publish.sh

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/bash
2+
3+
source ./docker_build.sh
4+
docker push $DOCKER_IMAGE_NAME:latest
5+
docker push $DOCKER_IMAGE_NAME:$DOCKER_IMAGE_VERSION

docker_build_and_run.sh

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/bash
2+
3+
source ./docker_build.sh
4+
docker run --rm -p 1111:1111 slydeveloper/spring-boot-admin

0 commit comments

Comments
 (0)