diff --git a/Dockerfile b/Dockerfile index 3c84dd3..37c5c70 100644 --- a/Dockerfile +++ b/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 (@online_en) +MAINTAINER Scaleway (@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 diff --git a/LICENSE b/LICENSE index 1ddf1c6..5bbd42f 100644 --- a/LICENSE +++ b/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 diff --git a/Makefile b/Makefile index 7e8bd3b..6e339bd 100644 --- a/Makefile +++ b/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 diff --git a/README.md b/README.md index 6dd0096..c777889 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ -Official Archlinux image on Online Labs [![Build Status](https://travis-ci.org/online-labs/image-archlinux.svg?branch=master)](https://travis-ci.org/online-labs/image-archlinux) -======================================= +Archlinux image on Scaleway [![Build Status](https://travis-ci.org/scaleway/image-archlinux.svg?branch=master)](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. @@ -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 [![Online Labs](https://raw.githubusercontent.com/online-labs/doc.cloud.online.net/master/www/documentation/docs_public/contents/images/logo_footer.png)](http://labs.online.net/) +A project by [![Scaleway](https://avatars1.githubusercontent.com/u/5185491?v=3&s=42)](https://www.scaleway.com/) diff --git a/patches/etc/ntp.conf b/patches/etc/ntp.conf index de37678..4de85a1 100644 --- a/patches/etc/ntp.conf +++ b/patches/etc/ntp.conf @@ -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 diff --git a/patches/etc/systemd/network/eth0.network b/patches/etc/systemd/network/eth0.network index ed16f31..dd886c8 100644 --- a/patches/etc/systemd/network/eth0.network +++ b/patches/etc/systemd/network/eth0.network @@ -4,4 +4,4 @@ Name=eth0 [Network] DNS=10.1.31.38 DNS=10.1.31.39 -Domains=cloud.online.net +Domains=scaleway.com diff --git a/patches/etc/systemd/resolved.conf.d/ocs.conf b/patches/etc/systemd/resolved.conf.d/ocs.conf index bbcb819..1beaff3 100644 --- a/patches/etc/systemd/resolved.conf.d/ocs.conf +++ b/patches/etc/systemd/resolved.conf.d/ocs.conf @@ -1,4 +1,4 @@ -# online cloud's DNS +# Scaleway's DNS [Resolve] DNS=10.1.31.38 diff --git a/patches/etc/systemd/system/oc-add-extra-volumes.service b/patches/etc/systemd/system/oc-add-extra-volumes.service index a2b842c..c21a364 100644 --- a/patches/etc/systemd/system/oc-add-extra-volumes.service +++ b/patches/etc/systemd/system/oc-add-extra-volumes.service @@ -1,5 +1,5 @@ [Unit] -Description=OCS additional volumes mounter +Description=SCW additional volumes mounter [Service] ExecStart=/usr/local/sbin/oc-add-extra-volumes diff --git a/patches/etc/systemd/system/oc-ssh-keys.service b/patches/etc/systemd/system/oc-ssh-keys.service index aa49f9a..da7d0f3 100644 --- a/patches/etc/systemd/system/oc-ssh-keys.service +++ b/patches/etc/systemd/system/oc-ssh-keys.service @@ -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] diff --git a/patches/etc/systemd/system/oc-sync-kernel-modules.service b/patches/etc/systemd/system/oc-sync-kernel-modules.service index 8cf5535..996eb21 100644 --- a/patches/etc/systemd/system/oc-sync-kernel-modules.service +++ b/patches/etc/systemd/system/oc-sync-kernel-modules.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] diff --git a/patches/usr/lib/dhcpcd/dhcpcd-hooks/29-ocs-metadata b/patches/usr/lib/dhcpcd/dhcpcd-hooks/29-ocs-metadata index 2a71e35..2096a34 100644 --- a/patches/usr/lib/dhcpcd/dhcpcd-hooks/29-ocs-metadata +++ b/patches/usr/lib/dhcpcd/dhcpcd-hooks/29-ocs-metadata @@ -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