diff --git a/basic-runtimes/java/Dockerfile b/basic-runtimes/java/Dockerfile index 29fd531..79a5eb2 100644 --- a/basic-runtimes/java/Dockerfile +++ b/basic-runtimes/java/Dockerfile @@ -3,11 +3,4 @@ MAINTAINER Disassembler RUN \ # Install Java 1.8 JRE - apk --no-cache add openjdk8-jre-base paxctl \ - # Fix grsec attributes to loosen memory protection restrictions - && paxctl -cm /usr/lib/jvm/java-1.8-openjdk/bin/java \ - && paxctl -cm /usr/lib/jvm/java-1.8-openjdk/bin/keytool \ - && paxctl -cm /usr/lib/jvm/java-1.8-openjdk/jre/bin/java \ - && paxctl -cm /usr/lib/jvm/java-1.8-openjdk/jre/bin/keytool \ - # Cleanup - && apk --no-cache del paxctl + apk --no-cache add openjdk8-jre-base diff --git a/crisiscleanup/Dockerfile b/crisiscleanup/Dockerfile index 3edc25c..73a2609 100644 --- a/crisiscleanup/Dockerfile +++ b/crisiscleanup/Dockerfile @@ -3,11 +3,7 @@ MAINTAINER Disassembler RUN \ # Install NodeJS runtime - apk --no-cache add nodejs paxctl \ - # Fix grsec attributes to loosen memory protection restrictions - && paxctl -cm /usr/bin/node \ - # Cleanup - && apk --no-cache del paxctl + apk --no-cache add nodejs RUN \ # Install runtime dependencies diff --git a/gnuhealth/Dockerfile b/gnuhealth/Dockerfile index 4186860..5be07bb 100644 --- a/gnuhealth/Dockerfile +++ b/gnuhealth/Dockerfile @@ -3,11 +3,7 @@ MAINTAINER Disassembler RUN \ # Install NodeJS runtime - apk --no-cache add nodejs paxctl \ - # Fix grsec attributes to loosen memory protection restrictions - && paxctl -cm /usr/bin/node \ - # Cleanup - && apk --no-cache del paxctl + apk --no-cache add nodejs RUN \ # Install runtime dependencies diff --git a/opendatakit-build/Dockerfile b/opendatakit-build/Dockerfile index f8c7a9f..e0e3e52 100644 --- a/opendatakit-build/Dockerfile +++ b/opendatakit-build/Dockerfile @@ -3,11 +3,7 @@ MAINTAINER Disassembler RUN \ # Install NodeJS runtime - apk --no-cache add nodejs paxctl \ - # Fix grsec attributes to loosen memory protection restrictions - && paxctl -cm /usr/bin/node \ - # Cleanup - && apk --no-cache del paxctl + apk --no-cache add nodejs RUN \ # Install runtime dependencies @@ -15,10 +11,7 @@ RUN \ RUN \ # Install build dependencies for ODK Build - apk --no-cache add --virtual .deps build-base git linux-headers openjdk8-jre-base paxctl postgresql-dev \ - # Fix grsec attributes to loosen memory protection restrictions - && paxctl -cm /usr/lib/jvm/java-1.8-openjdk/jre/bin/java \ - && paxctl -cm /usr/lib/jvm/java-1.8-openjdk/bin/java \ + apk --no-cache add --virtual .deps build-base git linux-headers openjdk8-jre-base postgresql-dev \ # Clone ODK Build && git clone --depth 1 https://github.com/opendatakit/build /srv/opendatakit-build \ # Install Ruby dependencies diff --git a/openmapkit/Dockerfile b/openmapkit/Dockerfile index fe8c853..773c13d 100644 --- a/openmapkit/Dockerfile +++ b/openmapkit/Dockerfile @@ -3,11 +3,7 @@ MAINTAINER Disassembler RUN \ # Install NodeJS runtime - apk --no-cache add nodejs paxctl \ - # Fix grsec attributes to loosen memory protection restrictions - && paxctl -cm /usr/bin/node \ - # Cleanup - && apk --no-cache del paxctl + apk --no-cache add nodejs RUN \ # Install runtime dependencies