Skip to content

Commit

Permalink
wifi-connect: temporary fix
Browse files Browse the repository at this point in the history
Temporary fix for #142
- pull in required changes from balena-os/wifi-connect#566
- increase timeout from 120 seconds to 180 seconds
  • Loading branch information
shawaj committed Aug 22, 2024
1 parent e76eed1 commit 0e58b9d
Show file tree
Hide file tree
Showing 4 changed files with 23,300 additions and 4 deletions.
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ services:
- PORTAL_LISTENING_PORT=8181
- PORTAL_SSID=balenaWiFi
- PORTAL_PASSPHRASE=balenaWiFi
- ACTIVITY_TIMEOUT=120
- ACTIVITY_TIMEOUT=180
ports:
- "8181:8181"
cap_add:
Expand Down
15 changes: 12 additions & 3 deletions wifi-connect/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ FROM balenalib/$BALENA_ARCH-debian
LABEL maintainer="https://github.com/ketilmo"
ARG BALENA_ARCH=%%BALENA_ARCH%%


RUN install_packages dnsmasq wireless-tools
RUN install_packages dnsmasq wireless-tools git npm

# use latest version. If specific version is required, it should be provided as vX.Y.Z, e.g v4.11.37
ARG VERSION="latest"
Expand All @@ -30,7 +29,17 @@ RUN \
export URL_PARTIAL="download/${VERSION}" ; \
fi; \
curl -Ls "$BASE_URL/$URL_PARTIAL/wifi-connect-$BINARY_ARCH_NAME.tar.gz" \
| tar -xvz -C /usr/src/app/
| tar -xvz -C /usr/src/app/ &&\
mkdir tmp && cd tmp &&\
git clone -b master --single-branch https://github.com/balena-os/wifi-connect

COPY package.json /usr/src/app/tmp/wifi-connect/ui/
COPY package-lock.json /usr/src/app/tmp/wifi-connect/ui/

RUN cd /usr/src/app/tmp/wifi-connect/ui && npm ci && npm run build &&\
mv /usr/src/app/tmp/wifi-connect/ui/build /usr/src/app/ui &&\
cd /usr/src/app && rm -rf tmp &&\
apt-get purge git npm && apt-get autoremove && apt-get clean && rm -rf /var/lib/apt/lists/*

COPY start.sh .

Expand Down
Loading

0 comments on commit 0e58b9d

Please sign in to comment.