Skip to content

Commit 607a909

Browse files
authored
Feature/disable hal explorer (#38)
Signed-off-by: Marvin Bechtold <[email protected]>
1 parent 00dfffa commit 607a909

File tree

2 files changed

+20
-1
lines changed

2 files changed

+20
-1
lines changed

Dockerfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ FROM maven:3-jdk-8 as builder
33
COPY . /tmp/pattern-atlas-api
44
WORKDIR /tmp/pattern-atlas-api
55
RUN mvn package -DskipTests
6+
RUN mv target/patternatlas.api-1.2.0-SNAPSHOT.jar target/patternatlas.api-1.2.0-SNAPSHOT-no-hal-explorer.jar
7+
RUN mvn package -DskipTests -PHAL_EXPLORER
68

79

810
FROM openjdk:8
@@ -15,16 +17,19 @@ ENV JDBC_DATABASE_USERNAME postgres
1517
ENV JDBC_DATABASE_PASSWORD postgres
1618
ENV JDBC_DATABASE_NAME postgres
1719
ENV JDBC_DATABASE_PORT 5060
20+
ENV HAL_EXPLORER true
1821

1922
RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
2023
&& tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
2124
&& rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
2225

2326
EXPOSE ${API_PORT}
2427
COPY --from=builder /tmp/pattern-atlas-api/target/patternatlas.api-1.2.0-SNAPSHOT.jar /var/www/java/api.jar
28+
COPY --from=builder /tmp/pattern-atlas-api/target/patternatlas.api-1.2.0-SNAPSHOT-no-hal-explorer.jar /var/www/java/api_no_hal_explorer.jar
2529

2630
ADD .docker/application.properties.tpl /var/www/java/application.properties.tpl
2731

2832
CMD dockerize -template /var/www/java/application.properties.tpl:/var/www/java/application.properties \
2933
&& cd /var/www/java/ \
30-
&& java -jar api.jar
34+
&& if [ $HAL_EXPLORER = "true" ]; then java -jar api.jar; else java -jar api_no_hal_explorer.jar; fi
35+

pom.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,18 @@
1919
<spring-oauth2.version>2.5.0</spring-oauth2.version>
2020
</properties>
2121

22+
<profiles>
23+
<profile>
24+
<id>HAL_EXPLORER</id>
25+
<dependencies>
26+
<dependency>
27+
<groupId>org.springframework.data</groupId>
28+
<artifactId>spring-data-rest-hal-explorer</artifactId>
29+
</dependency>
30+
</dependencies>
31+
</profile>
32+
</profiles>
33+
2234
<dependencies>
2335

2436
<dependency>
@@ -51,6 +63,8 @@
5163
<dependency>
5264
<groupId>org.springframework.data</groupId>
5365
<artifactId>spring-data-rest-hal-explorer</artifactId>
66+
<version>3.6.0</version>
67+
<type>pom</type>
5468
</dependency>
5569

5670
<dependency>

0 commit comments

Comments
 (0)