Skip to content

Commit aa63089

Browse files
committed
chore: use the new base image & remove remaining mvnw and gradlew instructions
Signed-off-by: behnazh-w <[email protected]>
1 parent 8b8a290 commit aa63089

File tree

2 files changed

+1
-21
lines changed

2 files changed

+1
-21
lines changed

docker/Dockerfile.final

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# Note that the local machine must login to ghcr.io so that Docker could pull the ghcr.io/oracle/macaron-base
1212
# image for this build.
1313

14-
FROM ghcr.io/oracle/macaron-base:latest@sha256:79b3b8b03cb9b6a124c6450f4baa58f96f83ee9e37f572c88a97597b35c7bc51
14+
FROM ghcr.io/oracle/macaron-base:latest@sha256:3b1f5ab197ee4429c598712bb8abb555a094e879f69e35439061777ac3bcb138
1515

1616
ENV HOME="/home/macaron"
1717

docs/source/pages/installation.rst

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -119,23 +119,3 @@ You can run the following command to make sure the proxy settings are updated:
119119
.. code-block:: shell
120120
121121
sudo systemctl show --property=Environment docker
122-
123-
'''''''''''''''''''''''''''''''
124-
Maven and Gradle proxy settings
125-
'''''''''''''''''''''''''''''''
126-
127-
Maven and Gradle do not use the system proxy settings. If the target software component (repository)
128-
is using either of these build tools, make sure to set up the following environment variables:
129-
130-
.. code-block:: shell
131-
132-
export MAVEN_OPTS="-Dhttp.proxyHost=wwww-example-proxy -Dhttp.proxyPort=80 -Dhttps.proxyHost=wwww-example-proxy -Dhttps.proxyPort=80"
133-
export GRADLE_OPTS="-Dhttp.proxyHost=wwww-example-proxy -Dhttp.proxyPort=80 -Dhttps.proxyHost=wwww-example-proxy -Dhttps.proxyPort=80"
134-
135-
In addition, Macaron uses the global settings files for Maven and Gradle if present on the host machine and copies them to
136-
the Docker container. You can set up your proxy settings in the following files:
137-
138-
* ``~/.m2/settings.xml``
139-
* ``~/.gradle/gradle.properties``
140-
141-
See the `Maven <https://maven.apache.org/settings.html#proxies>`_ and `Gradle <https://docs.gradle.org/current/userguide/build_environment.html#sec:accessing_the_web_via_a_proxy>`_ documentations for more information on setting up proxies.

0 commit comments

Comments
 (0)