Skip to content

Commit 87177f9

Browse files
Merge pull request #58 from Linkurious/develop
Release 0.0.24 [ci:run]
2 parents 6c5b14c + f55aeb6 commit 87177f9

File tree

5 files changed

+39
-9
lines changed

5 files changed

+39
-9
lines changed

.bumpversion.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 0.0.23
2+
current_version = 0.0.24
33
commit = False
44
tag = False
55
serialize =

.github/renovate.json

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,14 @@
55
"regexManagers:dockerfileVersions"
66
],
77
"baseBranches": ["develop"],
8-
"prConcurrentLimit": 10
8+
"prConcurrentLimit": 10,
9+
"packageRules": [
10+
{
11+
"groupName": "browsers",
12+
"matchDatasources": [
13+
"repology"
14+
],
15+
"separateMajorMinor": false
16+
}
17+
]
918
}

.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.0.23
1+
0.0.24

Dockerfile

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG PRIVATE_REGISTRY=hub.docker.nexus3.linkurious.net/
2-
FROM ${PRIVATE_REGISTRY}linkurious/docker-agent-jnlp:0.0.20
2+
FROM ${PRIVATE_REGISTRY}linkurious/docker-agent-jnlp:0.0.22
33
LABEL maintainer="Edward Nys <edward@linkurio.us>"
44
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
55
USER root
@@ -9,9 +9,9 @@ RUN curl -fsSL https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key a
99

1010
# Latest Ubuntu Google Chrome, XVFB and JRE installs
1111
# renovate: datasource=repology depName=aur/google-chrome versioning=loose
12-
ARG GOOGLE_CHROME_STABLE_VERSION=109.0.5414.74-1
12+
ARG GOOGLE_CHROME_STABLE_VERSION=110.0.5481.100-1
1313
# renovate: datasource=repology depName=debian_11/firefox-esr versioning=loose
14-
ARG FIREFOX_ESR_VERSION=102.6.0esr-1~deb11u1
14+
ARG FIREFOX_ESR_VERSION=102.8.0esr-1~deb11u1
1515
RUN apt-get update -qqy && \
1616
apt-get -qqy install --no-install-recommends \
1717
#xvfb=2:1.20.4-1 \
@@ -32,9 +32,9 @@ RUN git clone --depth 1 --branch "$NVM_VERSION" https://github.com/nvm-sh/nvm.gi
3232
&& echo -e 'export NVM_DIR="$HOME/.nvm"\n[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm\n' >> ~/.profile \
3333
&& source ~/.bashrc \
3434
&& export NVM_DIR="$HOME/.nvm" && \. "$NVM_DIR/nvm.sh" \
35-
&& nvm install 16.19.0 \
36-
&& nvm install 18.13.0 \
37-
&& nvm install 14.20.0
35+
&& nvm install 16.19.1 \
36+
&& nvm install 18.14.2 \
37+
&& nvm install 14.21.3
3838

3939
# for loading profile, to make nvm available for sh
4040
ENV ENV='$HOME/.profile'
@@ -50,5 +50,6 @@ LABEL maintainer="Edward Nys <edward@linkurio.us>" \
5050
org.opencontainers.image.documentation="https://github.com/Linkurious/docker-agent-jnlp-node" \
5151
org.opencontainers.image.title="Jenkins jnlp agent node for Linkurious" \
5252
org.opencontainers.image.url="https://github.com/Linkurious/docker-agent-jnlp-node" \
53+
org.opencontainers.image.source="https://github.com/Linkurious/docker-agent-jnlp-node" \
5354
org.opencontainers.image.vendor="Linkurious" \
5455
org.opencontainers.image.version="${BUILD_VERSION}"

docker-compose.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
version: '3.9'
3+
4+
services:
5+
docker-agent-jnlp-node:
6+
image: ${REPOSITORY:-}linkurious/docker-agent-jnlp-node:${DOCKER_AGENT_JNLP_NODE_VERSION:-0.0.24}
7+
build:
8+
context: .
9+
command: /bin/bash
10+
tty: true
11+
stdin_open: true
12+
# user: ${ID}
13+
environment:
14+
SSH_AUTH_SOCK: /ssh-agent
15+
NPM_TOKEN:
16+
GH_TOKEN:
17+
volumes:
18+
- /var/run/docker.sock:/var/run/docker.sock
19+
- ${PWD}:/data
20+
- ${SSH_AUTH_SOCK}:/ssh-agent

0 commit comments

Comments
 (0)