buildx update

britkat1980 · Feb 3, 2022 · 66d2498 · 66d2498
1 parent 48de36c
commit 66d2498
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
-settings.py
-settings.old
-__pycache__
-givtcp_debug.log
+src/settings.py
+src/settings.old
+src/__pycache__
+src/givtcp_debug.log
 .venv
-.vscode
+.vscode
+buildx.bat
diff --git a/buildx.bat b/buildx.bat
@@ -1,6 +1,2 @@
-<<<<<<< HEAD
 git pull
 docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 -t britkat/giv_tcp-ma:latest --push .
-=======
-docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 -t britkat/giv_tcp-ma:refactor --push .
->>>>>>> 7234e7a915c7cbe07bdabe1b64f1f3a0964405b6