mollyim/mollyim-android
1
0
Fork 0
mirror of https://github.com/mollyim/mollyim-android.git synced 2025-05-12 13:20:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Migrate to new docker compose syntax

Browse source
This commit is contained in:
Oscar Mira 2024-08-04 16:49:57 +02:00
parent 9f88caeb31
commit d55773ced4
No known key found for this signature in database
GPG key ID: B371B98C5DC32237
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.github/workflows/release.yml vendored
View file

@ -40,7 +40,7 @@ jobs:
cache: gradle
- name: Set up builder image
run: docker-compose build
run: docker compose build
working-directory: reproducible-builds
- name: Export CI environment variables
@ -72,12 +72,12 @@ jobs:
- name: Build without signing
if: "env.HAVE_KEYSTORE == 'false'"
run: docker-compose run -v "$HOME/.gradle/caches:/.gradle-ro-cache:ro" assemble
run: docker compose run -v "$HOME/.gradle/caches:/.gradle-ro-cache:ro" assemble
working-directory: reproducible-builds
- name: Build and sign
if: "env.HAVE_KEYSTORE == 'true'"
run: docker-compose run -v "$HOME/.gradle/caches:/.gradle-ro-cache:ro" assemble
run: docker compose run -v "$HOME/.gradle/caches:/.gradle-ro-cache:ro" assemble
working-directory: reproducible-builds
env:
CI_KEYSTORE_PATH: certs/keystore.jks

4
.github/workflows/reprocheck.yml vendored
View file

@ -31,7 +31,7 @@ jobs:
ref: "${{ env.TAG_REF }}"
- name: Set up builder image
run: docker-compose build
run: docker compose build
working-directory: reproducible-builds
- name: Export CI environment variables
@ -55,7 +55,7 @@ jobs:
MAPS_API_KEY: ${{ vars.CI_MAPS_API_KEY }}
- name: Build release
run: docker-compose run assemble
run: docker compose run assemble
working-directory: reproducible-builds
- uses: actions/upload-artifact@v4

6
BUILDING.md
View file

@ -54,7 +54,7 @@ You can build Molly using GitHub Actions, either with GitHub-hosted public runne
## Building Using the CLI
If you prefer building Molly locally on your computer, you can follow these steps, which are essentially the same procedure as in the [Reproducible Build guide](reproducible-builds/README.md). You have the option to customize the build by exporting environment variables or saving them in a `.env` file before running `docker-compose`.
If you prefer building Molly locally on your computer, you can follow these steps, which are essentially the same procedure as in the [Reproducible Build guide](reproducible-builds/README.md). You have the option to customize the build by exporting environment variables or saving them in a `.env` file before running `docker compose`.
### Steps
@ -76,14 +76,14 @@ export CI_APP_TITLE="Molly"
export CI_PACKAGE_ID="im.molly.app"
# Build the APK using Docker environment
docker-compose up --build
docker compose up --build
# Optionally, save environment variables in a .env file for future builds
echo "CI_APP_TITLE=Molly" >> .env
echo "CI_PACKAGE_ID=im.molly.app" >> .env
# Shut down the Docker environment after use
docker-compose down
docker compose down
```
The built APKs will be available in the `output/apk` directory. Make sure to [sign the APKs](#signing-the-apks) before installation.

4
reproducible-builds/README.md
View file

@ -33,7 +33,7 @@ git checkout $VERSION
# Before proceeding, you should open this tutorial (README.md file) and review the instructions.
# Build the APK using the Docker environment
docker-compose up --build
docker compose up --build
# Download the official APK
wget https://github.com/mollyim/mollyim-android/releases/download/$VERSION/Molly-$VERSION.apk
@ -48,7 +48,7 @@ python apkdiff/apkdiff.py Molly-$VERSION.apk outputs/apk/prodGmsWebsite/release/
python apkdiff/apkdiff.py Molly-$VERSION-FOSS.apk outputs/apk/prodFossWebsite/release/Molly-unsigned-$VERSION-FOSS.apk
# Clean up the Docker environment
docker-compose down
docker compose down
```
If you get `APKs match`, you have **successfully verified** that the official release matches with your own self-built version of Molly. Congratulations!