Skip to content

Commit 3e0cce0

Browse files
committed
release karaf only for amd64
1 parent be74b00 commit 3e0cce0

4 files changed

Lines changed: 58 additions & 19 deletions

File tree

.github/workflows/release-karaf.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,6 @@ jobs:
3434
with:
3535
context: karaf
3636
push: true
37-
platforms: linux/amd64,linux/arm64
37+
# platforms: linux/amd64,linux/arm64
38+
platforms: linux/arm64
3839
tags: malaskowski/aet_karaf:${{ github.event.inputs.version }}

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,5 @@ atlassian-ide-plugin.xml
3030
example-aet-swarm.zip
3131
example-aet-swarm/bundles/*.jar
3232

33-
karaf/bundles/*.jar
33+
karaf/bundles/*.jar
34+
karaf/tmp-*

karaf/Dockerfile

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,25 @@
1616
# limitations under the License.
1717
#
1818

19-
FROM maven:3.8.4-jdk-8 as builder
20-
RUN apt-get update \
21-
&& apt-get install git unzip tzdata \
22-
&& update-ca-certificates
19+
# FROM maven:3.8.4-jdk-8 as builder
20+
# RUN apt-get update \
21+
# && apt-get install git unzip tzdata \
22+
# && update-ca-certificates
2323

24-
# Clone Karaf on 4.2.0 tag
25-
RUN mkdir -p ~/.ssh/ && ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts \
26-
&& git clone https://github.com/apache/karaf.git \
27-
&& cd karaf \
28-
&& git checkout tags/karaf-4.2.0 -b karaf-4.2.0-aet \
29-
&& git status
24+
# # Clone Karaf on 4.2.0 tag
25+
# RUN mkdir -p ~/.ssh/ && ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts \
26+
# && git clone https://github.com/apache/karaf.git \
27+
# && cd karaf \
28+
# && git checkout tags/karaf-4.2.0 -b karaf-4.2.0-aet \
29+
# && git status
3030

31-
WORKDIR /karaf
31+
# WORKDIR /karaf
3232

33-
RUN sed -i 's/http/https/g' assemblies/features/base/pom.xml \
34-
&& sed -i 's/1.10.1/1.11.14/g' pom.xml
33+
# RUN sed -i 's/http/https/g' assemblies/features/base/pom.xml \
34+
# && sed -i 's/1.10.1/1.11.14/g' pom.xml
3535

36-
# Build custom Karaf instance with bumped pax.logging to 1.11.14
37-
RUN mvn clean install -DskipTests -Pfastinstall
36+
# # Build custom Karaf instance with bumped pax.logging to 1.11.14
37+
# RUN mvn clean install -DskipTests -Pfastinstall
3838

3939
#################################################################################
4040

@@ -52,9 +52,11 @@ ARG AET_ARTIFACT_DOWNLOAD_URL="https://github.com/wttech/aet/releases/download/$
5252
RUN apk add --update bash tar jq curl tree && rm -rf /var/cache/apk/*
5353

5454
# Copy custom Karaf version from builder to prevent downloading the original one
55-
COPY --from=builder /root/.m2/repository/org/apache/karaf /home/karaf/.m2/repository/org/apache/karaf
55+
# COPY --from=builder /root/.m2/repository/org/apache/karaf /home/karaf/.m2/repository/org/apache/karaf
56+
COPY tmp-m2/repository/org/apache/karaf /home/karaf/.m2/repository/org/apache/karaf
5657

57-
COPY --from=builder /karaf/assemblies/apache-karaf/target/apache-karaf-4.2.0.zip /tmp
58+
# COPY --from=builder /karaf/assemblies/apache-karaf/target/apache-karaf-4.2.0.zip /tmp
59+
COPY tmp-karaf/assemblies/apache-karaf/target/apache-karaf-4.2.0.zip /tmp
5860
RUN mkdir -p /opt/karaf
5961
RUN unzip -o /tmp/apache-karaf-4.2.0.zip -d /tmp && mv /tmp/apache-karaf-4.2.0/* /opt/karaf
6062
RUN rm /tmp/apache-karaf-4.2.0.zip && rm -rf /tmp/apache-karaf-4.2.0

karaf/prepare-image.sh

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
#
2+
# AET Docker
3+
#
4+
# Copyright (C) 2018 Maciej Laskowski
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
18+
#!/bin/sh
19+
20+
rm -rf tmp-karaf
21+
22+
git clone https://github.com/apache/karaf.git tmp-karaf \
23+
&& cd tmp-karaf \
24+
&& git checkout tags/karaf-4.2.0 -b karaf-4.2.0-aet \
25+
&& git status
26+
27+
28+
gsed -i 's/http/https/g' assemblies/features/base/pom.xml \
29+
&& gsed -i 's/1.10.1/1.11.14/g' pom.xml
30+
31+
# Build custom Karaf instance with bumped pax.logging to 1.11.14
32+
mvn install -DskipTests -Pfastinstall
33+
34+
mkdir -p tmp-m2/repository/org/apache/karaf
35+
cp -R ~/.m2/repository/org/apache/karaf tmp-m2/repository/org/apache/karaf

0 commit comments

Comments
 (0)