mirror of
https://gitlab.com/openstapps/openstapps.git
synced 2026-02-14 12:52:56 +00:00
refactor: rebase
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
### Set base image
|
||||
FROM ubuntu:20.04
|
||||
FROM ubuntu:22.04
|
||||
|
||||
LABEL version="2.0.0" \
|
||||
description="Build environment for the StApps app." \
|
||||
@@ -10,7 +10,7 @@ ENV ANDROID_APIS="android-34" \
|
||||
ANDROID_BUILD_TOOLS_VERSION="34.0.0" \
|
||||
NODE_VERSION="22.x" \
|
||||
NPM_VERSION="^10.0.0" \
|
||||
IONIC_VERSION="^6.0.0" \
|
||||
IONIC_VERSION="^7.0.0" \
|
||||
CORDOVA_RES_VERSION="latest" \
|
||||
### Configure download URLs
|
||||
ANDROID_SDK_TOOLS_DOWNLOAD_URL="https://dl.google.com/android/repository/commandlinetools-linux-6858069_latest.zip" \
|
||||
@@ -43,7 +43,7 @@ RUN apt-get update && \
|
||||
git \
|
||||
gradle \
|
||||
ca-certificates-java \
|
||||
python \
|
||||
python3 \
|
||||
python3-pip \
|
||||
software-properties-common \
|
||||
ssh \
|
||||
@@ -54,9 +54,9 @@ RUN apt-get update && \
|
||||
musl-dev \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
### Install Java Development Kit 17
|
||||
### Install Java Development Kit 21
|
||||
RUN add-apt-repository -y ppa:openjdk-r/ppa && apt-get update && \
|
||||
apt-get install --no-install-recommends -y openjdk-17-jdk \
|
||||
apt-get install --no-install-recommends -y openjdk-21-jdk \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
### Setup the locale
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
### Set base image
|
||||
FROM cypress/base:22.0.0
|
||||
FROM cypress/base:22.16.0
|
||||
|
||||
USER root
|
||||
|
||||
@@ -61,9 +61,9 @@ ENV DBUS_SESSION_BUS_ADDRESS=/dev/null
|
||||
|
||||
# install Firefox browser
|
||||
RUN export FIREFOX_VERSION=$(curl -fsSL https://product-details.mozilla.org/1.0/firefox_versions.json | jq -r '.LATEST_FIREFOX_VERSION') && \
|
||||
wget --no-verbose -O /tmp/firefox.tar.bz2 "https://download-installer.cdn.mozilla.net/pub/firefox/releases/${FIREFOX_VERSION}/linux-x86_64/en-US/firefox-${FIREFOX_VERSION}.tar.bz2" && \
|
||||
tar -C /opt -xjf /tmp/firefox.tar.bz2 && \
|
||||
rm /tmp/firefox.tar.bz2 && \
|
||||
wget --no-verbose -O /tmp/firefox.tar.xz "https://download-installer.cdn.mozilla.net/pub/firefox/releases/${FIREFOX_VERSION}/linux-x86_64/en-US/firefox-${FIREFOX_VERSION}.tar.xz" && \
|
||||
tar -C /opt -xJf /tmp/firefox.tar.xz && \
|
||||
rm /tmp/firefox.tar.xz && \
|
||||
ln -fs /opt/firefox/firefox /usr/bin/firefox
|
||||
|
||||
RUN echo "Downloading Latest Edge version..."
|
||||
|
||||
Reference in New Issue
Block a user