Skip to content

Commit

Permalink
Use GHCR for the classic watchdog
Browse files Browse the repository at this point in the history
Fixes a multi-arch issue with the classic templates

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>
  • Loading branch information
alexellis committed Dec 2, 2020
1 parent 8a284e1 commit e14c0ed
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion template/csharp/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion template/dockerfile/function/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion template/go/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion template/node/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion template/php7/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion template/python/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion template/python3-debian/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion template/python3/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion template/ruby/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down

0 comments on commit e14c0ed

Please sign in to comment.