Skip to content

Commit

Permalink
Merge branch 'release/2.0.0-beta.6' into feature/2.x
Browse files Browse the repository at this point in the history
  • Loading branch information
matthew-holder-revvity committed Aug 23, 2024
2 parents f03881c + 337d385 commit 9867fa4
Show file tree
Hide file tree
Showing 3 changed files with 6,711 additions and 9,622 deletions.
15 changes: 5 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# Docker Desktop provides support for this feature.
#

FROM --platform=linux/arm/v7 debian:buster
FROM --platform=linux/arm/v7 debian:bullseye

# Install the basics.
ENV DEBIAN_FRONTEND=noninteractive
Expand All @@ -24,16 +24,9 @@ RUN apt-get update -y && \
rm -rf /var/lib/apt/lists && \
rm -rf /var/cache/apt

# Install the project dependencies.
ENV USE_SYSTEM_FPM=true
RUN apt-get update -y && \
apt-get install -y unzip ruby-dev && \
gem install fpm && \
rm -rf /var/lib/apt/lists && \
rm -rf /var/cache/apt

# Default environment.
ENV SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
ENV NODE_EXTRA_CA_CERTS=/etc/ssl/certs/ca-certificates.crt

# Setup user.
RUN useradd -m builder
Expand All @@ -43,7 +36,9 @@ USER builder
SHELL ["/bin/bash", "-lc"]
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.0/install.sh | bash
RUN nvm install 20 && \
nvm use 20
nvm use 20 && \
corepack enable && \
corepack enable npm

# Setup entrypoint.
COPY docker /
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "bridgecmdr",
"productName": "BridgeCmdr",
"version": "2.0.0-beta.5",
"version": "2.0.0-beta.6",
"description": "Controller for professional A/V monitors and switches",
"packageManager": "yarn@4.4.0",
"packageManager": "yarn@1.22.22",
"type": "module",
"private": true,
"engines": {
Expand Down
Loading

0 comments on commit 9867fa4

Please sign in to comment.