forked from cory/tildefriends
		
	build: Fix docker build, and speed it up a bit?
This commit is contained in:
		| @@ -1,4 +1,3 @@ | ||||
| .svn | ||||
| db.sqlite | ||||
| out/**/*.o | ||||
| out/**/*.d | ||||
| .git | ||||
| db.sqlite* | ||||
| out/ | ||||
|   | ||||
| @@ -30,7 +30,7 @@ jobs: | ||||
|         uses: android-actions/setup-android@v3 | ||||
|         with: | ||||
|           packages: 'tools platform-tools build-tools;34.0.0 platforms;android-34 ndk;26.3.11579264' | ||||
|       - run: docker build . | ||||
|       - run: DOCKER_BUILDKIT=1 docker build . | ||||
|       - run: ANDROID_SDK=$HOME/.android/sdk make -j`nproc` all dist docs | ||||
|       - uses: actions/upload-artifact@v3 | ||||
|         with: | ||||
|   | ||||
| @@ -1,4 +1,4 @@ | ||||
| FROM bitnami/minideb:bullseye AS build | ||||
| FROM bitnami/minideb:bookworm AS build | ||||
|  | ||||
| RUN apt-get update && \ | ||||
| 	apt-get install -y --no-install-recommends \ | ||||
| @@ -10,7 +10,7 @@ RUN apt-get update && \ | ||||
| COPY . /app | ||||
| RUN make -C /app -j $(nproc) release | ||||
|  | ||||
| FROM bitnami/minideb:bullseye | ||||
| FROM bitnami/minideb:bookworm | ||||
|  | ||||
| COPY --from=build /app/out/release/tildefriends /app/out/release/tildefriends | ||||
| COPY --from=build /app/apps /app/apps | ||||
|   | ||||
		Reference in New Issue
	
	Block a user