diff --git a/README.md b/README.md index 621310f..eee8055 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,4 @@ -18 :e open a new file in new buffer -19 :b roll between opened files -20 :b auto complete with names of oppened buffers -21 :set hidden add that to be able to cancel changes -22 :ls list buffer oppened -23 :x bw delete buffer number x, even if it's a directory -24 :bd delete buffer actual buffer -25 :bp go to previous buffer -26 :bn go to next buffer -27 :b# switch to last edited buffer -28 :e C-d print the list of files in current directory -29 :e C-d auto complete with a mathing name of files in current directory -30 :explore / :ex navigate through directory, rename, and plus - # inception This README would normally document whatever steps are necessary to get your application up and running. @@ -89,9 +75,10 @@ CMD [ "/hello" ] - [download alpine linux](https://alpinelinux.org/downloads/) - [dockerhub alpine image](https://hub.docker.com/_/alpine) - [docker glossaire](https://docs.docker.com/glossary/) -- [syntax of Dockerfile](https://docs.docker.com/engine/reference/builder/) +- [Dockerfile syntaxe](https://docs.docker.com/engine/reference/builder/) - [determine the parent image](https://forums.docker.com/t/determine-the-parent-image/48611) - [docker image from scratch](https://codeburst.io/docker-from-scratch-2a84552470c8) +- [build context and image context](https://stackoverflow.com/questions/55108649/what-is-app-working-directory-for-a-dockerfile/55109065#55109065) #### volumes vs bind mounts diff --git a/srcs/.env b/srcs/.env index 4789e9f..24739c7 100644 --- a/srcs/.env +++ b/srcs/.env @@ -1,8 +1,8 @@ -DOMAIN_NAME=wil.42.fr -# certificates -CERTS_=./XXXXXXXXXXXX -# MYSQL SETUP -MYSQL_ROOT_PASSWORD=XXXXXXXXXXXX -MYSQL_USER=XXXXXXXXXXXX -MYSQL_PASSWORD=XXXXXXXXXXXX -[...] +# DOMAIN_NAME=wil.42.fr +# # certificates +# CERTS_=./XXXXXXXXXXXX +# # MYSQL SETUP +# MYSQL_ROOT_PASSWORD=XXXXXXXXXXXX +# MYSQL_USER=XXXXXXXXXXXX +# MYSQL_PASSWORD=XXXXXXXXXXXX +# [...] diff --git a/srcs/docker-compose.yml b/srcs/docker-compose.yml index e69de29..36499fa 100644 --- a/srcs/docker-compose.yml +++ b/srcs/docker-compose.yml @@ -0,0 +1,13 @@ +# doc : https://docs.docker.com/compose/compose-file/compose-versioning/ +# version : https://docs.docker.com/compose/compose-file/compose-versioning/ +# version to download : https://github.com/docker/compose/releases/ +# had to remove the apt version because it was not up to date (sudo apt remove docker-compose) +# then install as recommended : curl -SL https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-x86_64 -o /usr/local/bin/docker-compose +# or (neat) : https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose +version: "3.8" + +services: + test: + build: + context: ./requirements/test + dockerfile: Dockerfile diff --git a/srcs/requirements/mariadb/Dockerfile b/srcs/requirements/mariadb/Dockerfile index 21e61ee..e69de29 100644 --- a/srcs/requirements/mariadb/Dockerfile +++ b/srcs/requirements/mariadb/Dockerfile @@ -1,10 +0,0 @@ - -# build this image from parent image alpine:3.16.1 -# available there : https://hub.docker.com/_/alpine -FROM alpine:3.16.1 -WORKDIR /mariadb -#ENV PORT 80 - - - - diff --git a/srcs/requirements/test/.dockerignore b/srcs/requirements/test/.dockerignore new file mode 100644 index 0000000..e69de29 diff --git a/srcs/requirements/test/Dockerfile b/srcs/requirements/test/Dockerfile new file mode 100644 index 0000000..dd9a770 --- /dev/null +++ b/srcs/requirements/test/Dockerfile @@ -0,0 +1,14 @@ + +# find official images : https://hub.docker.com/search +#FROM ubuntu:18.04 +#FROM alpine:3.16.1 +#FROM debian:buster + +# basic test +# build with : sudo docker build --tag test . +# run with : sudo docker run test +# 'hello' in assembly found here : http://timelessname.com/elfbin/ +FROM scratch +COPY tools/hello / +CMD [ "/hello" ] + diff --git a/srcs/requirements/test/tools/hello b/srcs/requirements/test/tools/hello new file mode 100755 index 0000000..2eeeb9d Binary files /dev/null and b/srcs/requirements/test/tools/hello differ diff --git a/srcs/requirements/test/tools/hello.asm b/srcs/requirements/test/tools/hello.asm new file mode 100644 index 0000000..0cc26b9 --- /dev/null +++ b/srcs/requirements/test/tools/hello.asm @@ -0,0 +1,16 @@ + SECTION .data +msg: db "Hi World",10 +len: equ $-msg + + SECTION .text + global main +main: + mov edx,len + mov ecx,msg + mov ebx,1 + mov eax,4 + int 0x80 + mov ebx,0 + mov eax,1 + int 0x80 +