Skip to content

Use the jre image as the base image #7680

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wu-sheng merged 4 commits into from
Sep 8, 2021
Merged

Use the jre image as the base image #7680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8d296c4
Use the jre image as the base image
hanahmily Sep 8, 2021
e211e86
Update Change logs
hanahmily Sep 8, 2021
828e4e0
Ignore errors when installing openssl
hanahmily Sep 8, 2021
d852728
Update base images of test cases
hanahmily Sep 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/e2e.istio.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ env:
SKIP_TEST: true
TAG: ${{ github.sha }}
SCRIPTS_DIR: test/e2e-mesh/e2e-istio/scripts
SW_OAP_BASE_IMAGE: openjdk:11-jdk
SW_OAP_BASE_IMAGE: adoptopenjdk/openjdk11:alpine-jre
SW_KUBERNETES_COMMIT_SHA: 6d5897616ce30ebb1706c0cf566ac36f733d93e0

concurrency:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e.jdk-versions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
env:
SW_SIMPLE_CASE: jdk
SW_AGENT_JDK_VERSION: ${{ matrix.jdk }}
SW_OAP_BASE_IMAGE: adoptopenjdk/openjdk${{ matrix.jdk }}:alpine
SW_OAP_BASE_IMAGE: adoptopenjdk/openjdk${{ matrix.jdk }}:alpine-jre
steps:
- uses: actions/checkout@v2
with:
Expand Down
1 change: 1 addition & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ Release Notes.
* Fix ElasticSearch storage plugin doesn't work when hot reloading from `secretsManagementFile`.
* Support etcd grouped dynamic configurations.
* Unified the config word `namespace` in the project.
* Switch JRE base image for dev images.

#### UI

Expand Down
22 changes: 4 additions & 18 deletions docker/oap/Dockerfile.oap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,28 +14,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.

ARG BASE_IMAGE='adoptopenjdk/openjdk11:alpine'
ARG BASE_IMAGE='adoptopenjdk/openjdk11:alpine-jre'
Copy link
Copy Markdown
Member

@kezhenxu94 kezhenxu94 Sep 8, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to update

skywalking/.github/workflows/e2e.jdk-versions.yaml

Line 40 in edcf592

SW_OAP_BASE_IMAGE: adoptopenjdk/openjdk${{ matrix.jdk }}:alpine
so that different versions of jre can be tested.

Copy link
Copy Markdown
Contributor Author

@hanahmily hanahmily Sep 8, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gotcha. I also found some other openjdk in e2e tests, for example, istio relevant cases.

Copy link
Copy Markdown
Member

@wu-sheng wu-sheng Sep 8, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we have jre agent image already?

Copy link
Copy Markdown
Member

@kezhenxu94 kezhenxu94 Sep 8, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we have jre agent image already?

For Java agent, no, it's still using JDK

Copy link
Copy Markdown
Member

@wu-sheng wu-sheng Sep 8, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, seems we should take care of it later.


FROM golang:1.14 AS cli

ARG COMMIT_HASH=9f267876493943716434fdaa30047a14c0b5b2d9
ARG CLI_CODE=${COMMIT_HASH}.tar.gz
ARG CLI_CODE_URL=https://github.com/apache/skywalking-cli/archive/${CLI_CODE}

ENV CGO_ENABLED=0
ENV GO111MODULE=on

WORKDIR /cli

ADD ${CLI_CODE_URL} .
RUN tar -xf ${CLI_CODE} --strip 1
RUN rm ${CLI_CODE}

RUN mkdir -p /skywalking/bin/
RUN make linux && mv bin/swctl-latest-linux-amd64 /skywalking/bin/swctl
FROM apache/skywalking-base:8.7.0-es7 AS cli

FROM $BASE_IMAGE

RUN apk add --no-cache openssl || true

ENV JAVA_OPTS=" -Xms256M " \
SW_CLUSTER="standalone" \
SW_STORAGE="h2"
Expand Down
2 changes: 1 addition & 1 deletion docker/ui/Dockerfile.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM adoptopenjdk/openjdk11:alpine
FROM adoptopenjdk/openjdk11:alpine-jre

ENV DIST_NAME=apache-skywalking-apm-bin \
JAVA_OPTS=" -Xms256M " \
Expand Down