Skip to content

Commit e4d107d

Browse files
author
Quentin Perez
committed
Update sample
1 parent 7be2d6c commit e4d107d

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

overlay/root/Dockerfile.sample

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM scaleway/ubuntu:amd64-vivid
1+
FROM scaleway/ubuntu:amd64-wily
22
# following 'FROM' lines are used dynamically thanks do the image-builder
33
# which dynamically update the Dockerfile if needed.
4-
#FROM scaleway/ubuntu:armhf-vivid # arch=armv7l
5-
#FROM scaleway/ubuntu:arm64-vivid # arch=arm64
6-
#FROM scaleway/ubuntu:i386-vivid # arch=i386
7-
#FROM scaleway/ubuntu:mips-vivid # arch=mips
4+
#FROM scaleway/ubuntu:armhf-wily # arch=armv7l
5+
#FROM scaleway/ubuntu:arm64-wily # arch=arm64
6+
#FROM scaleway/ubuntu:i386-wily # arch=i386
7+
#FROM scaleway/ubuntu:mips-wily # arch=mips
88

99
# Prepare rootfs
1010
RUN /usr/local/sbin/scw-builder-enter

overlay/root/Makefile.sample

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
NAME = APP_NAME
1+
NAME = my-image
22
VERSION = latest
33
VERSION_ALIASES = 1.2.3 1.2 1
4-
TITLE = APP_TITLE
5-
DESCRIPTION = APP_DESCRIPTION
4+
TITLE = My image
5+
DESCRIPTION = My image with Ubuntu and MySQL
66
DOC_URL =
77
SOURCE_URL = https://github.com/scaleway-community/...
88
VENDOR_URL =
@@ -11,7 +11,7 @@ DEFAULT_IMAGE_ARCH = x86_64
1111

1212
IMAGE_VOLUME_SIZE = 50G
1313
IMAGE_BOOTSCRIPT = stable
14-
IMAGE_NAME = APP_IMAGE_NAME
14+
IMAGE_NAME = My image
1515

1616
## Image tools (https://github.com/scaleway/image-tools)
1717
all: docker-rules.mk

0 commit comments

Comments
 (0)