marker/shuffle-cracked
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rolled back ghcr things

Browse Source
This commit is contained in:
frikky
2020-09-06 05:32:26 +02:00
parent 561f367c97
commit ca7e0c227d
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
functions/onprem/orborus/build.sh
+2 -2
View File
@@ -6,6 +6,6 @@ echo "Running docker build with $NAME:$VERSION"
docker build . -t frikky/shuffle:$NAME -t docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION -t frikky/$NAME:$VERSION -t ghcr.io/frikky/$NAME:$VERSION docker build . -t frikky/shuffle:$NAME -t docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION -t frikky/$NAME:$VERSION -t ghcr.io/frikky/$NAME:$VERSION
#docker push frikky/$NAME:$VERSION #docker push frikky/$NAME:$VERSION
#docker push frikky/shuffle:$NAME docker push frikky/shuffle:$NAME
# docker push docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION # docker push docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION
docker push ghcr.io/frikky/$NAME:$VERSION #docker push ghcr.io/frikky/$NAME:$VERSION
functions/onprem/orborus/orborus.go
+9 -7
View File
@@ -34,7 +34,8 @@ var appSdkVersion = os.Getenv("SHUFFLE_APP_SDK_VERSION")
var workerVersion = os.Getenv("SHUFFLE_WORKER_VERSION") var workerVersion = os.Getenv("SHUFFLE_WORKER_VERSION")
//var baseimagename = "docker.pkg.github.com/frikky/shuffle" //var baseimagename = "docker.pkg.github.com/frikky/shuffle"
var baseimagename = "ghcr.io/frikky" //var baseimagename = "ghcr.io/frikky"
var baseimagename = "frikky/shuffle"
var orgId = os.Getenv("ORG_ID") var orgId = os.Getenv("ORG_ID")
var baseUrl = os.Getenv("BASE_URL") var baseUrl = os.Getenv("BASE_URL")
@@ -213,12 +214,12 @@ func initializeImages() {
// check whether theyre the same first // check whether theyre the same first
images := []string{ images := []string{
// fmt.Sprintf("docker.io/%s:app_sdk", baseimagename), fmt.Sprintf("docker.io/%s:app_sdk", baseimagename),
// fmt.Sprintf("docker.io/%s:worker", baseimagename), fmt.Sprintf("docker.io/%s:worker", baseimagename),
fmt.Sprintf("%s/worker:%s", baseimagename, workerVersion), //fmt.Sprintf("%s/worker:%s", baseimagename, workerVersion),
fmt.Sprintf("%s/app_sdk:%s", baseimagename, appSdkVersion), //fmt.Sprintf("%s/app_sdk:%s", baseimagename, appSdkVersion),
fmt.Sprintf("frikky/shuffle:app_sdk"), //fmt.Sprintf("frikky/shuffle:app_sdk"),
} }
pullOptions := types.ImagePullOptions{} pullOptions := types.ImagePullOptions{}
@@ -268,7 +269,8 @@ func main() {
//workerName := "worker" //workerName := "worker"
//workerVersion := "0.1.0" //workerVersion := "0.1.0"
//workerImage := fmt.Sprintf("docker.pkg.github.com/frikky/shuffle/%s:%s", workerName, workerVersion) //workerImage := fmt.Sprintf("docker.pkg.github.com/frikky/shuffle/%s:%s", workerName, workerVersion)
workerImage := fmt.Sprintf("%s/worker:%s", baseimagename, workerVersion) //workerImage := fmt.Sprintf("%s/worker:%s", baseimagename, workerVersion)
workerImage := fmt.Sprintf("docker.io/%s:worker", baseimagename)
log.Printf("[INFO] Finished configuring docker environment") log.Printf("[INFO] Finished configuring docker environment")
functions/onprem/worker/build.sh
+2 -2
View File
@@ -7,6 +7,6 @@ docker build . -t frikky/shuffle:$NAME -t docker.pkg.github.com/frikky/shuffle/$
# Push both for now.. # Push both for now..
#docker push frikky/$NAME:$VERSION #docker push frikky/$NAME:$VERSION
#docker push frikky/shuffle:$NAME docker push frikky/shuffle:$NAME
#docker push docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION #docker push docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION
docker push ghcr.io/frikky/$NAME:$VERSION #docker push ghcr.io/frikky/$NAME:$VERSION