Skip to content

Commit c3fa935

Browse files
authored
Merge pull request #386 from linuxserver/Bumps
Bump YQ and Alpine
2 parents 3f5847d + fc68f85 commit c3fa935

4 files changed

Lines changed: 7 additions & 7 deletions

File tree

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-alpine:3.22
3+
FROM ghcr.io/linuxserver/baseimage-alpine:3.23
44

55
# set version label
66
ARG BUILD_DATE
@@ -10,7 +10,7 @@ LABEL maintainer="roxedus, thelamer"
1010

1111
RUN \
1212
echo "**** install build packages ****" && \
13-
YQ_VERSION=v4.45.1 &&\
13+
YQ_VERSION=v4.52.5 &&\
1414
wget https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_amd64 -O /usr/bin/yq &&\
1515
chmod +x /usr/bin/yq && \
1616
apk add --no-cache --upgrade \

Dockerfile.aarch64

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.22
3+
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.23
44

55
# set version label
66
ARG BUILD_DATE
@@ -10,7 +10,7 @@ LABEL maintainer="roxedus, thelamer"
1010

1111
RUN \
1212
echo "**** install build packages ****" && \
13-
YQ_VERSION=v4.45.1 &&\
13+
YQ_VERSION=v4.52.5 &&\
1414
wget https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_arm64 -O /usr/bin/yq &&\
1515
chmod +x /usr/bin/yq && \
1616
apk add --no-cache --upgrade \

ansible/generate.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
- name: Set UID
2020
tags: [ "always" ]
2121
changed_when: false
22-
when: lookup('env', 'PUID')
22+
when: lookup('env', 'PUID') | ternary(True, False)
2323
user:
2424
name: abc
2525
non_unique: yes
@@ -28,7 +28,7 @@
2828
- name: Set GID
2929
tags: [ "always" ]
3030
changed_when: false
31-
when: lookup('env', 'PGID')
31+
when: lookup('env', 'PGID') | ternary(True, False)
3232
group:
3333
name: abc
3434
non_unique: yes

ansible/roles/github/tasks/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
- permissions.yml
3030

3131
- name: Populate conditional Github workflows
32-
when: item.when
32+
when: item.when | ternary(True, False)
3333
template:
3434
src: "{{ item.file }}.j2"
3535
dest: "/tmp/.github/workflows/{{ item.file }}"

0 commit comments

Comments
 (0)