Skip to content

Commit

Permalink
Migrate to new docker compose syntax
Browse files Browse the repository at this point in the history
  • Loading branch information
valldrac committed Aug 4, 2024
1 parent 9f88cae commit d55773c
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/reprocheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions BUILDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions reproducible-builds/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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!
Expand Down

0 comments on commit d55773c

Please sign in to comment.