Skip to content

Commit

Permalink
Updated to Athenz version 1.12.x (#5)
Browse files Browse the repository at this point in the history
* Updated to Athenz version 1.12.x

* Fixed Dockerfile

* Renamed from athenz-auth-core to athenz-plugins

* Fixed InstanceJenkinsProviderTest

* Fixed InstanceJenkinsProvider
  • Loading branch information
ctyano authored Oct 28, 2024
1 parent e0f7626 commit 9deb9d2
Show file tree
Hide file tree
Showing 10 changed files with 372 additions and 984 deletions.
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM docker.io/library/maven:3-eclipse-temurin-11-focal as builder
FROM docker.io/library/maven:3-eclipse-temurin-17-focal as builder

ARG VERSION=
ARG ATHENZ_VERSION=
ARG JAVA_VERSION=11
ARG JAVA_VERSION=17
# date -u +'%Y-%m-%dT%H:%M:%SZ'
ARG BUILD_DATE
# git rev-parse --short HEAD
Expand All @@ -15,7 +15,7 @@ LABEL org.opencontainers.image.title="Athenz Auth Core"
LABEL org.opencontainers.image.authors="ctyano <[email protected]>"
LABEL org.opencontainers.image.vendor="ctyano <[email protected]>"
LABEL org.opencontainers.image.licenses="Private"
LABEL org.opencontainers.image.url="ghcr.io/ctyano/athenz-auth-core"
LABEL org.opencontainers.image.url="ghcr.io/ctyano/athenz-plugins"
LABEL org.opencontainers.image.documentation="https://www.athenz.io/"
LABEL org.opencontainers.image.source="https://github.com/AthenZ/athenz"

Expand All @@ -37,8 +37,8 @@ FROM docker.io/library/openjdk:22-slim-bullseye

ARG VERSION

COPY --from=builder /target/athenz-auth-core-$VERSION.jar /target/athenz-auth-core-$VERSION.jar
COPY --from=builder /target/athenz-plugins-$VERSION.jar /target/athenz-plugins-$VERSION.jar

ENV JAR_DESTINATION "/"

ENTRYPOINT ["/bin/sh", "-c", "cp -p /target/athenz-auth-core-*.jar ${JAR_DESTINATION}/athenz-auth-core.jar"]
ENTRYPOINT ["/bin/sh", "-c", "cp -p /target/athenz-plugins-*.jar ${JAR_DESTINATION}/athenz-plugins.jar"]
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# athenz-auth-core
# athenz-plugins

This is an unofficial repository to provide tools, packages and instructions for [Athenz](https://www.athenz.io).

Expand All @@ -9,15 +9,15 @@ It is currently owned and maintained by [ctyano](https://github.com/ctyano).
```
VERSION=0.0.0
ATHENZ_PACKAGE_VERSION="$(curl -s https://api.github.com/repos/AthenZ/athenz/tags | jq -r .[].name | sed -e 's/.*v\([0-9]*.[0-9]*.[0-9]*\).*/\1/g' | sort -ru | head -n1)"
docker build --build-arg VERSION=${VERSION:-0.0.0} --build-arg ATHENZ_VERSION=${ATHENZ_PACKAGE_VERSION} -t athenz-auth-core .
docker build --build-arg VERSION=${VERSION:-0.0.0} --build-arg ATHENZ_VERSION=${ATHENZ_PACKAGE_VERSION} -t athenz-plugins .
```

## How to generate pom.xml

```
VERSION=0.0.0
ATHENZ_VERSION="$(curl -s https://api.github.com/repos/AthenZ/athenz/tags | jq -r .[].name | sed -e 's/.*v\([0-9]*.[0-9]*.[0-9]*\).*/\1/g' | sort -ru | head -n1)"
JAVA_VERSION=11
JAVA_VERSION=17
cat pom.xml.template \
| $HOME/.local/bin/yq -p xml -o xml ".project.version=\"${VERSION}\"" \
| $HOME/.local/bin/yq -p xml -o xml ".project.properties.\"athenz.version\"=\"${ATHENZ_VERSION}\"" \
Expand All @@ -29,9 +29,9 @@ cat pom.xml.template \

### Docker(OCI) Image

[athenz-auth-core](https://github.com/users/ctyano/packages/container/package/athenz-auth-core)
[athenz-plugins](https://github.com/users/ctyano/packages/container/package/athenz-plugins)

### JAR class package

https://github.com/ctyano/athenz-auth-core/releases
https://github.com/ctyano/athenz-plugins/releases

16 changes: 8 additions & 8 deletions pom.xml.template
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<name>athenz-auth-core</name>
<name>athenz-plugins</name>
<description>Core Auth Interfaces</description>
<groupId>io.athenz</groupId>
<artifactId>athenz-auth-core</artifactId>
<artifactId>athenz-plugins</artifactId>
<version>0.0.0</version>
<packaging>jar</packaging>
<url>https://www.athenz.io</url>
Expand Down Expand Up @@ -173,9 +173,9 @@

<profiles>
<profile>
<id>jdk11</id>
<id>jdk17</id>
<activation>
<jdk>[11,)</jdk>
<jdk>[17,)</jdk>
</activation>
<build>
<plugins>
Expand All @@ -185,16 +185,16 @@
<version>${maven-compiler-plugin.version}</version>
<executions>
<execution>
<id>jdk11</id>
<id>jdk17</id>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<release>11</release>
<release>17</release>
<compileSourceRoots>
<compileSourceRoot>${project.basedir}/src/main/java11</compileSourceRoot>
<compileSourceRoot>${project.basedir}/src/main/java17</compileSourceRoot>
</compileSourceRoots>
<outputDirectory>${project.build.outputDirectory}/META-INF/versions/11</outputDirectory>
<outputDirectory>${project.build.outputDirectory}/META-INF/versions/17</outputDirectory>
</configuration>
</execution>
</executions>
Expand Down
Loading

0 comments on commit 9deb9d2

Please sign in to comment.