Skip to content

Commit 2525c1a

Browse files
committed
Add 'acl' package to Dockerfile-*
This is in order to ensure that the 'setfacl' command is properly installed during testing, as it is required by our BATS tests. In particular, it is needed during the BATS test for Frontail install. Signed-off-by: Ethan Dye <[email protected]>
1 parent 3b48577 commit 2525c1a

8 files changed

+8
-8
lines changed

Dockerfile.amd64

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ENV APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=DontWarn
1212
# those packages would normally be included in our standard install
1313
RUN apt-get update -qq \
1414
&& apt-get install --yes -qq --no-install-recommends systemd systemd-sysv git wget python3 python3-pip apt-utils jq \
15-
lsb-release unzip apt-transport-https \
15+
lsb-release unzip apt-transport-https acl \
1616
&& rm -rf /var/lib/apt/lists/*
1717
RUN git clone https://github.com/bats-core/bats-core.git && \
1818
cd bats-core && \

Dockerfile.amd64-ubuntu

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ENV APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=DontWarn
1212
# those packages would normally be included in our standard install
1313
RUN apt-get update -qq \
1414
&& apt-get install --yes -qq --no-install-recommends systemd systemd-sysv git wget python3 python3-pip apt-utils jq \
15-
lsb-release unzip apt-transport-https \
15+
lsb-release unzip apt-transport-https acl \
1616
&& rm -rf /var/lib/apt/lists/*
1717
RUN git clone https://github.com/bats-core/bats-core.git && \
1818
cd bats-core && \

Dockerfile.raspberry-pi

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ENV APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=DontWarn
1313
# those packages would normally be included in our standard install
1414
RUN apt-get update -qq \
1515
&& apt-get install --yes -qq --no-install-recommends systemd systemd-sysv git wget python3 python3-pip apt-utils jq \
16-
lsb-release unzip apt-transport-https \
16+
lsb-release unzip apt-transport-https acl \
1717
&& rm -rf /var/lib/apt/lists/*
1818
RUN git clone https://github.com/bats-core/bats-core.git && \
1919
cd bats-core && \

Dockerfile.raspberry-pi2

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ENV APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=DontWarn
1313
# those packages would normally be included in our standard install
1414
RUN apt-get update -qq \
1515
&& apt-get install --yes -qq --no-install-recommends systemd systemd-sysv git wget python3 python3-pip apt-utils jq \
16-
lsb-release unzip apt-transport-https \
16+
lsb-release unzip apt-transport-https acl \
1717
&& rm -rf /var/lib/apt/lists/*
1818
RUN git clone https://github.com/bats-core/bats-core.git && \
1919
cd bats-core && \

Dockerfile.raspberrypi3

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ENV APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=DontWarn
1313
# those packages would normally be included in our standard install
1414
RUN apt-get update -qq \
1515
&& apt-get install --yes -qq --no-install-recommends systemd systemd-sysv git wget python3 python3-pip apt-utils jq \
16-
lsb-release unzip apt-transport-https \
16+
lsb-release unzip apt-transport-https acl \
1717
&& rm -rf /var/lib/apt/lists/*
1818
RUN git clone https://github.com/bats-core/bats-core.git && \
1919
cd bats-core && \

Dockerfile.raspberrypi3-64

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ENV APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=DontWarn
1313
# those packages would normally be included in our standard install
1414
RUN apt-get update -qq \
1515
&& apt-get install --yes -qq --no-install-recommends systemd systemd-sysv git wget python3 python3-pip apt-utils jq \
16-
lsb-release unzip apt-transport-https \
16+
lsb-release unzip apt-transport-https acl \
1717
&& rm -rf /var/lib/apt/lists/*
1818
RUN git clone https://github.com/bats-core/bats-core.git && \
1919
cd bats-core && \

Dockerfile.raspberrypi4-64

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ENV APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=DontWarn
1313
# those packages would normally be included in our standard install
1414
RUN apt-get update -qq \
1515
&& apt-get install --yes -qq --no-install-recommends systemd systemd-sysv git wget python3 python3-pip apt-utils jq \
16-
lsb-release unzip apt-transport-https \
16+
lsb-release unzip apt-transport-https acl \
1717
&& rm -rf /var/lib/apt/lists/*
1818
RUN git clone https://github.com/bats-core/bats-core.git && \
1919
cd bats-core && \

functions/nodejs-apps.bats

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ load openhab.bash
66

77
setup_file() {
88
export BASEDIR="${BATS_TEST_DIRNAME}/.."
9+
setfacl -R -m g::rwX /var/log/openhab2
910
}
1011

1112
teardown_file() {
@@ -15,7 +16,6 @@ teardown_file() {
1516

1617
@test "installation-frontail_install" {
1718
echo -e "# ${COL_CYAN}$(timestamp) [openHABian] Frontail installation starting...${COL_DEF}" >&3
18-
setfacl -R -m g::rwX /var/log/openhab2
1919
run frontail_setup 3>&-
2020
if [ "$status" -ne 0 ]; then echo "$output" >&3; fi
2121
[ "$status" -eq 0 ]

0 commit comments

Comments
 (0)