Merge pull request #90 from kapishmalik/feature/add-support-for-wiremock-options-as-env-variable

#78 - Add support for WireMock CLI options as environment variable

Author: oleg-nenashev

alpine/docker-entrypoint.sh

@@ -4,15 +4,15 @@ set -e
 
 # Set `java` command if needed
 if [ "$1" = "" -o "${1#-}" != "$1" ]; then
-  set -- java $JAVA_OPTS -cp /var/wiremock/lib/*:/var/wiremock/extensions/* wiremock.Run "$@"
+  set -- java $JAVA_OPTS -cp /var/wiremock/lib/*:/var/wiremock/extensions/* wiremock.Run "$@" $WIREMOCK_OPTIONS
 fi
 
 # allow the container to be started with `-e uid=`
 if [ "$uid" != "" ]; then
   # Change the ownership of /home/wiremock to $uid
   chown -R $uid:$uid /home/wiremock
 
-  set -- su-exec $uid:$uid "$@"
+  set -- su-exec $uid:$uid "$@"  $WIREMOCK_OPTIONS
 fi
 
-exec "$@"
+exec "$@"  $WIREMOCK_OPTIONS

docker-entrypoint.sh

@@ -4,15 +4,14 @@ set -e
 
 # Set `java` command if needed
 if [ "$1" = "" -o "${1:0:1}" = "-" ]; then
-  set -- java $JAVA_OPTS -cp /var/wiremock/lib/*:/var/wiremock/extensions/* wiremock.Run "$@"
+  set -- java $JAVA_OPTS -cp /var/wiremock/lib/*:/var/wiremock/extensions/* wiremock.Run "$@"  $WIREMOCK_OPTIONS
 fi
 
 # allow the container to be started with `-e uid=`
 if [ "$uid" != "" ]; then
   # Change the ownership of /home/wiremock to $uid
   chown -R $uid:$uid /home/wiremock
-
-  set -- gosu $uid:$uid "$@"
+  set -- gosu $uid:$uid "$@" $WIREMOCK_OPTIONS
 fi
 
-exec "$@"
+exec "$@" $WIREMOCK_OPTIONS

test/integration-tests/src/test/java/org/wiremock/docker/it/WireMockOptionsTest.java

@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2023 WireMock Inc, Oleg Nenashev and all project contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.wiremock.docker.it;
+
+import org.junit.jupiter.api.Test;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+
+import org.wiremock.integrations.testcontainers.WireMockContainer;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@Testcontainers
+class WireMockOptionsTest {
+
+  @Container
+  public WireMockContainer wiremockServer = new WireMockContainer(TestConfig.WIREMOCK_IMAGE)
+    .withEnv("WIREMOCK_OPTIONS", "--verbose");
+
+  @Test
+  public void checkVerboseEnablingLogLine() {
+    assertTrue(wiremockServer.getLogs().contains("Verbose logging enabled"));
+  }
+}