Skip to content
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

Jump to bottom

Use Java 11 #41

Merged
merged 8 commits into from
Jul 17, 2022
Merged

Use Java 11 #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6687c55
Use nginx stable (1.22.0), not 1.13.6
MarkEWaite Jul 17, 2022
2086f56
Install Java 11, not Java 8
MarkEWaite Jul 17, 2022
f862886
Update examples in README
MarkEWaite Jul 17, 2022
386d943
Add sed package, needed for build process
MarkEWaite Jul 17, 2022
413838a
Rely on PATH to find sed program
MarkEWaite Jul 17, 2022
a7772de
Fewer calls to apt-get
MarkEWaite Jul 17, 2022
ea9e531
Remove Java 8 workaround, simplify apt-get calls
MarkEWaite Jul 17, 2022
74b7878
Use archiveArtifacts instead of deprecated archive task
MarkEWaite Jul 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 3 additions & 7 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
FROM nginx:1.13.6
# Use nginx stable
FROM nginx:1.22.0

ARG PUBLISH_PATH=/usr/share/nginx/html

RUN apt-get update
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=863199, man-db does not help
RUN mkdir -p /usr/share/man/man1/
RUN apt-get purge openjdk-7-jre-headless && apt-get install -y openjdk-8-jdk wget ant groovy

RUN apt-get install -y curl
RUN apt-get update && apt-get install -y openjdk-11-jdk wget ant groovy curl sed

# Just test settings to speedup the startup
ARG LTS_RELEASES=""
Expand Down
5 changes: 4 additions & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,10 @@ try {

stage('Archive') {
sh 'cd build && tar -cjf javadoc-site.tar.bz2 site'
archive 'build/*.tar.bz2'
archiveArtifacts artifacts: 'build/*.tar.bz2',
allowEmptyArchive: false,
fingerprint: false,
onlyIfSuccessful: true
}

if (infra.isTrusted()){
Expand Down
6 changes: 3 additions & 3 deletions README.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@ which can be used for running the build and verifying results.
Build command:

```shell
docker build -t jenkinsinfra/javadoc-dev --build-arg LTS_RELEASES=2.73 --build-arg PLUGINS="credentials git git-client" .
docker build -t jenkinsinfra/javadoc-dev --build-arg LTS_RELEASES="2.332 2.346" --build-arg PLUGINS="credentials git git-client" .
```

Optional arguments:

* `LTS_RELEASES` - list of LTS releases to be published
** Example: "2.60 2.73"
** Example: "2.332 2.346"
** Default: all LTS lines returned by link:https://repo.jenkins-ci.org[Jenkins Artifactory]
** Javadoc for the latest weekly will be published anyway
* `PLUGINS` - list of plugins to be published
** Example: "git github git-client"
** Example: "credentials git git-client"
** Default: all plugins by the default Jenkins update site

### Running image
Expand Down
2 changes: 1 addition & 1 deletion src/main/groovy/JavadocGroupBuilder.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public class JavadocGroupBuilder {
*/
def search = new File(plugin_dir, 'search.js')
if (search.exists()) {
def sedParams = ['/usr/bin/sed', '-i', '-e', 's/if (ui.item.p == item.l)/if (item.m \\&\\& ui.item.p == item.l)/g', search.absolutePath] as String[]
def sedParams = ['sed', '-i', '-e', 's/if (ui.item.p == item.l)/if (item.m \\&\\& ui.item.p == item.l)/g', search.absolutePath] as String[]
def sedProc = Runtime.getRuntime().exec(sedParams)
def sedReturn = sedProc.waitFor()
if (sedReturn != 0) {
Expand Down