Skip to content

Commit

Permalink
reverted 8c3e1b9 and b9679b5
Browse files Browse the repository at this point in the history
  • Loading branch information
Orbiter committed Sep 12, 2019
1 parent b9679b5 commit 065e92d
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ script:
- flake8 bin
- docker build -t loklak_server .
- docker images
- docker run loklak_server sh /loklak_server/bin/start.sh -I
- docker run loklak_server bash /loklak_server/bin/start.sh -I
after_success:
- bash <(curl -s https://codecov.io/bash)
- gradle clean
Expand Down
3 changes: 3 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ RUN cd /loklak_server && ./gradlew build --no-daemon -x checkstyleMain -x checks
# Second Stage
FROM openjdk:8-jre-alpine

# install required software
RUN apk update && apk add --no-cache bash

# Create Volume for persistence
VOLUME ["/loklak_server/data"]

Expand Down
3 changes: 3 additions & 0 deletions Dockerfile-arm32v6
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ RUN cd /loklak_server && ./gradlew build --no-daemon -x checkstyleMain -x checks
# Second Stage
FROM arm32v6/openjdk:8-jre-alpine

# install required software
RUN apk update && apk add --no-cache bash

# Create Volume for persistence
VOLUME ["/loklak_server/data"]

Expand Down
5 changes: 4 additions & 1 deletion Dockerfile-arm32v7
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM arm32v7/openjdk:8-alpine
FROM arm32v7/openjdk:8-alpine AS builder
LABEL maintainer="Michael Peter Christen <[email protected]>"

# This image is suitable for Raspberry Pi 3, 4 and Compute Module 3,
Expand Down Expand Up @@ -27,6 +27,9 @@ RUN cd /loklak_server && ./gradlew build --no-daemon -x checkstyleMain -x checks
# Second Stage
FROM arm32v7/openjdk:8-jre-alpine

# install required software
RUN apk update && apk add --no-cache bash

# Create Volume for persistence
VOLUME ["/loklak_server/data"]

Expand Down
2 changes: 1 addition & 1 deletion bin/.preload.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env sh
#!/usr/bin/env bash

JARFILE="build/libs/loklak_server-all.jar"
INSTALLATIONCONFIG="data/settings/installation.txt"
Expand Down
2 changes: 1 addition & 1 deletion bin/checkalive.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env sh
#!/usr/bin/env bash
cd "`dirname $0`"

# for a production environment with high-availability requirement,
Expand Down
2 changes: 1 addition & 1 deletion bin/installation.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env sh
#!/usr/bin/env bash

# If you're looking for the variables, please go to bin/.preload.sh

Expand Down
2 changes: 1 addition & 1 deletion bin/start.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env sh
#!/usr/bin/env bash

# If you're looking for the variables, please go to bin/.preload.sh

Expand Down

0 comments on commit 065e92d

Please sign in to comment.