Use GHCR for the classic watchdog

alexellis · alexellis · commit e14c0ed98c94 · 2020-12-02T14:57:26.000Z
Fixes a multi-arch issue with the classic templates

Signed-off-by: Alex Ellis (OpenFaaS Ltd) &lt;alexellis2@gmail.com&gt;
diff --git a/template/csharp/Dockerfile b/template/csharp/Dockerfile
@@ -1,4 +1,4 @@
-FROM openfaas/classic-watchdog:0.18.18 as watchdog
+FROM ghcr.io/openfaas/classic-watchdog:0.1.2 as watchdog
 
 FROM mcr.microsoft.com/dotnet/core/sdk:3.1 as builder
 
diff --git a/template/dockerfile/function/Dockerfile b/template/dockerfile/function/Dockerfile
@@ -1,4 +1,4 @@
-FROM openfaas/classic-watchdog:0.18.18 as watchdog
+FROM ghcr.io/openfaas/classic-watchdog:0.1.2 as watchdog
 
 FROM alpine:3.12
 
diff --git a/template/go/Dockerfile b/template/go/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=${TARGETPLATFORM:-linux/amd64} openfaas/classic-watchdog:0.18.18 as watchdog
+FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.1.2 as watchdog
 FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.13-alpine3.12 as builder
 
 # Required to enable Go modules
diff --git a/template/node/Dockerfile b/template/node/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=${TARGETPLATFORM:-linux/amd64} openfaas/classic-watchdog:0.18.18 as watchdog
+FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.1.2 as watchdog
 FROM --platform=${TARGETPLATFORM:-linux/amd64} node:12.13.0-alpine as ship
 
 COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
diff --git a/template/php7/Dockerfile b/template/php7/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=${TARGETPLATFORM:-linux/amd64} openfaas/classic-watchdog:0.18.18 as watchdog
+FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.1.2 as watchdog
 
 # start with the official Composer image and name it
 FROM --platform=${TARGETPLATFORM:-linux/amd64} composer:1.7 AS composer
diff --git a/template/python/Dockerfile b/template/python/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=${TARGETPLATFORM:-linux/amd64} openfaas/classic-watchdog:0.18.18 as watchdog
+FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.1.2 as watchdog
 
 FROM --platform=${TARGETPLATFORM:-linux/amd64} python:2.7-alpine
 
diff --git a/template/python3-debian/Dockerfile b/template/python3-debian/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=${TARGETPLATFORM:-linux/amd64} openfaas/classic-watchdog:0.18.18 as watchdog
+FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.1.2 as watchdog
 FROM --platform=${TARGETPLATFORM:-linux/amd64} python:3
 
 # Allows you to add additional packages via build-arg
diff --git a/template/python3/Dockerfile b/template/python3/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=${TARGETPLATFORM:-linux/amd64} openfaas/classic-watchdog:0.18.18 as watchdog
+FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.1.2 as watchdog
 
 FROM --platform=${TARGETPLATFORM:-linux/amd64} python:3-alpine
 
diff --git a/template/ruby/Dockerfile b/template/ruby/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=${TARGETPLATFORM:-linux/amd64} openfaas/classic-watchdog:0.18.18 as watchdog
+FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.1.2 as watchdog
 
 FROM --platform=${TARGETPLATFORM:-linux/amd64} ruby:alpine
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM openfaas/classic-watchdog:0.18.18 as watchdog`
	`1`	`+FROM ghcr.io/openfaas/classic-watchdog:0.1.2 as watchdog`
`2`	`2`
`3`	`3`	`FROM mcr.microsoft.com/dotnet/core/sdk:3.1 as builder`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM --platform=${TARGETPLATFORM:-linux/amd64} openfaas/classic-watchdog:0.18.18 as watchdog`
	`1`	`+FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.1.2 as watchdog`
`2`	`2`	`FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.13-alpine3.12 as builder`
`3`	`3`
`4`	`4`	`# Required to enable Go modules`