s/onlinelabs/scaleway/g
This commit is contained in:
Manfred Touron
parent
49609bce15
commit
a12c6136c4
10
Dockerfile
10
Dockerfile
|
|
@ -1,10 +1,10 @@
|
|||
## -*- docker-image-name: "armbuild/ocs-distrib-archlinux:latest" -*-
|
||||
## -*- docker-image-name: "armbuild/scw-distrib-archlinux:latest" -*-
|
||||
FROM armbuild/archlinux-disk:2014-12-02
|
||||
MAINTAINER Online Labs <opensource@ocs.online.net> (@online_en)
|
||||
MAINTAINER Scaleway <opensource@scaleway.com> (@scaleway)
|
||||
|
||||
|
||||
# Environment
|
||||
ENV OCS_BASE_IMAGE armbuild/ocs-archlinux:2014-12-02
|
||||
ENV SCW_BASE_IMAGE armbuild/scw-archlinux:2014-12-02
|
||||
|
||||
|
||||
# Install packages
|
||||
|
|
@ -87,12 +87,12 @@ RUN pacman --noconfirm -Suy
|
|||
|
||||
|
||||
# Patch rootfs
|
||||
RUN wget -qO - http://j.mp/ocs-scripts | bash
|
||||
RUN wget -qO - http://j.mp/scw-skeleton | FLAVORS=common,docker-based bash -e
|
||||
ADD ./patches/etc/ /etc/
|
||||
ADD ./patches/usr/ /usr/
|
||||
|
||||
|
||||
# Enable Online-Labs services
|
||||
# Enable Scaleway services
|
||||
RUN systemctl enable oc-ssh-keys \
|
||||
&& systemctl enable oc-add-extra-volumes \
|
||||
&& systemctl enable oc-sync-kernel-modules
|
||||
|
|
|
|||
2
LICENSE
2
LICENSE
|
|
@ -1,6 +1,6 @@
|
|||
The MIT License (MIT)
|
||||
|
||||
Copyright (c) 2014-2015 Online Labs
|
||||
Copyright (c) 2014-2015 Scaleway
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
|
|
|
|||
10
Makefile
10
Makefile
|
|
@ -1,15 +1,15 @@
|
|||
DOCKER_NAMESPACE = armbuild/
|
||||
NAME = ocs-distrib-archlinux
|
||||
NAME = scw-distrib-archlinux
|
||||
VERSION = latest
|
||||
VERSION_ALIASES = 2014-12-02
|
||||
TITLE = Archlinux
|
||||
DESCRIPTION = Archlinux latest
|
||||
SOURCE_URL = https://github.com/online-labs/image-archlinux
|
||||
SOURCE_URL = https://github.com/scaleway/image-archlinux
|
||||
|
||||
|
||||
## Image tools (https://github.com/online-labs/image-tools)
|
||||
all: docker-rules.mk
|
||||
## Image tools (https://github.com/scaleway/image-tools)
|
||||
all: docker-rules.mk
|
||||
docker-rules.mk:
|
||||
wget -qO - http://j.mp/image-tools | bash
|
||||
wget -qO - http://j.mp/scw-image-tools | bash
|
||||
-include docker-rules.mk
|
||||
## Below you can add custom makefile commands and overrides
|
||||
|
|
|
|||
16
README.md
16
README.md
|
|
@ -1,11 +1,11 @@
|
|||
Official Archlinux image on Online Labs [](https://travis-ci.org/online-labs/image-archlinux)
|
||||
=======================================
|
||||
Archlinux image on Scaleway [](https://travis-ci.org/scaleway/image-archlinux)
|
||||
===========================
|
||||
|
||||
**Warning: this image is not yet working**
|
||||
|
||||
Scripts to build the official Archlinux image on Online Labs
|
||||
Scripts to build the official Archlinux image on Scaleway
|
||||
|
||||
This image is built using [Image Tools](https://github.com/online-labs/image-tools) and is based on the official [Ubuntu](https://github.com/online-labs/image-ubuntu) image.
|
||||
This image is built using [Image Tools](https://github.com/scaleway/image-tools) and is based on the official [Ubuntu](https://github.com/scaleway/image-ubuntu) image.
|
||||
|
||||
<img src="http://upload.wikimedia.org/wikipedia/commons/5/59/Archlogo.png" width="300px" />
|
||||
|
||||
|
|
@ -15,18 +15,18 @@ This image is built using [Image Tools](https://github.com/online-labs/image-too
|
|||
|
||||
We use the Docker's building system and convert it at the end to a disk image that will boot on real servers without Docker. Note that the image is still runnable as a Docker container for debug or for inheritance.
|
||||
|
||||
[More info](https://github.com/online-labs/image-tools#docker-based-builder)
|
||||
[More info](https://github.com/scaleway/image-tools#docker-based-builder)
|
||||
|
||||
---
|
||||
|
||||
Install
|
||||
-------
|
||||
|
||||
Build and write the image to /dev/nbd1 (see [documentation](https://doc.cloud.online.net/howto/create_image.html))
|
||||
Build and write the image to /dev/nbd1 (see [documentation](https://www.scaleway.com/docs/create_an_image_with_docker))
|
||||
|
||||
$ make install
|
||||
|
||||
Full list of commands available at: [online-labs/image-tools](https://github.com/online-labs/image-tools/tree/master#commands)
|
||||
Full list of commands available at: [scaleway/image-tools](https://github.com/scaleway/image-tools/#commands)
|
||||
|
||||
---
|
||||
|
||||
|
|
@ -38,4 +38,4 @@ links
|
|||
|
||||
---
|
||||
|
||||
A project by [](http://labs.online.net/)
|
||||
A project by [](https://www.scaleway.com/)
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# - http://support.ntp.org/bin/view/Support/GettingStarted
|
||||
# - https://wiki.archlinux.org/index.php/Network_Time_Protocol_daemon
|
||||
|
||||
server ntp.int.cloud.online.net
|
||||
server ntp.int.scaleway.com
|
||||
|
||||
# Associate to public NTP pool servers; see http://www.pool.ntp.org/
|
||||
server 0.arch.pool.ntp.org
|
||||
|
|
|
|||
|
|
@ -4,4 +4,4 @@ Name=eth0
|
|||
[Network]
|
||||
DNS=10.1.31.38
|
||||
DNS=10.1.31.39
|
||||
Domains=cloud.online.net
|
||||
Domains=scaleway.com
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# online cloud's DNS
|
||||
# Scaleway's DNS
|
||||
|
||||
[Resolve]
|
||||
DNS=10.1.31.38
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
[Unit]
|
||||
Description=OCS additional volumes mounter
|
||||
Description=SCW additional volumes mounter
|
||||
|
||||
[Service]
|
||||
ExecStart=/usr/local/sbin/oc-add-extra-volumes
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
[Unit]
|
||||
Description=OCS fetch ssh keys from metadata
|
||||
Description=SCW fetch ssh keys from metadata
|
||||
After=NetworkManager-wait-online.service
|
||||
|
||||
[Service]
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
[Unit]
|
||||
Description=OCS fetch kernel modules from OCS mirror
|
||||
Description=SCW fetch kernel modules from Scaleway mirror
|
||||
After=NetworkManager-wait-online.service
|
||||
|
||||
[Service]
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Fetch OCS metadata
|
||||
# Fetch Scaleway metadata
|
||||
|
||||
fetch_ocs_metadata()
|
||||
fetch_scw_metadata()
|
||||
{
|
||||
metadata_host_name=$(/usr/local/bin/oc-metadata --cached HOSTNAME)
|
||||
if [ "x$metadata_host_name" != "x" ]; then
|
||||
|
|
@ -14,5 +14,5 @@ fetch_ocs_metadata()
|
|||
}
|
||||
|
||||
if $if_up; then
|
||||
fetch_ocs_metadata
|
||||
fetch_scw_metadata
|
||||
fi
|
||||
|
|
|
|||
Loading…
Reference in New Issue