Просмотр исходного кода

darkwallet: move from docker to podman (eat ze bugs)

darkfi 2 лет назад
Родитель
Сommit
1ad9752581
3 измененных файлов с 8 добавлено и 10 удалено
  1. 1 1
      bin/darkwallet/Dockerfile
  2. 3 3
      bin/darkwallet/Makefile
  3. 4 6
      bin/darkwallet/README.android.md

+ 1 - 1
bin/darkwallet/Dockerfile

@@ -1,4 +1,4 @@
-FROM archlinux
+FROM docker.io/archlinux
 
 RUN pacman -Syu --noconfirm
 RUN pacman -S --noconfirm jdk8-openjdk unzip wget cmake openssl pkgconf gcc git

+ 3 - 3
bin/darkwallet/Makefile

@@ -2,13 +2,13 @@ default:
 	cargo lrun
 
 android:
-	docker run -v $(shell pwd):/root/dw -w /root/dw -t apk cargo quad-apk build
-	adb uninstall darkfi.darkwallet
+	#podman run -v $(shell pwd):/root/dw -w /root/dw -t apk cargo quad-apk build
+	#adb uninstall darkfi.darkwallet
 	adb install target/android-artifacts/debug/apk/darkwallet.apk
 	reset
 	adb logcat -c
 	adb logcat -s darkfi
 
 clean:
-	docker run -v $(shell pwd):/root/dw -w /root/dw -t apk rm -fr target/
+	podman run -v $(shell pwd):/root/dw -w /root/dw -t apk rm -fr target/
 

+ 4 - 6
bin/darkwallet/README.android.md

@@ -1,15 +1,13 @@
-Docker commands:
-
 ```
-docker system prune -a
-docker build -t apk .
+podman system service
+podman build -t apk .
 ```
 
 ```
 # This command gives an interactive terminal (useful for debugging):
-#docker run -v $(pwd):/root/dw -it apk bash
+#podman run -v $(pwd):/root/dw -it apk bash
 
-docker run -v $(pwd):/root/dw -w /root/dw -t apk cargo quad-apk build
+podman run -v $(pwd):/root/dw -w /root/dw -t apk cargo quad-apk build
 ```
 
 Enable USB debugging in developer options and run the following commands: