diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..c381d41
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,32 @@
+FROM php:8.2-apache
+LABEL maintainer='Jaivic'
+
+RUN a2enmod rewrite
+
+RUN apt-get update && apt-get install -y \
+    zlib1g-dev \
+    libicu-dev \
+    libzip-dev \
+    libxml2-dev \
+    libpq-dev \
+    libpng-dev \
+    nano \
+    && docker-php-ext-install pdo pdo_pgsql pgsql zip bcmath gd intl soap opcache \
+    && docker-php-ext-configure pgsql -with-pgsql=/usr/local/pgsql
+
+COPY --from=composer /usr/bin/composer /usr/bin/composer
+
+ENV COMPOSER_ALLOW_SUPERUSER 1
+
+COPY . /var/www/ddjj
+WORKDIR /var/www/ddjj
+
+RUN chown -R www-data:www-data /var/www/ddjj \
+    && composer install
+
+RUN cd /var/www/ddjj/storage/ \
+    && mkdir -p framework/sessions framework/views framework/cache/data \
+    && chmod -R 775 framework \
+    && chown -R www-data:www-data framework \
+    && cp -f ../docker/000-default.conf /etc/apache2/sites-enabled/000-default.conf \
+    && chown -R www-data:www-data logs
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..5c9675d
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,31 @@
+services:
+
+  ddjj:
+    image: jirho/ddjj:latest
+    #volumes:
+    #  - /etc/localtime:/etc/localtime/:ro
+    #  - /etc/timezone:/etc/timezone/:ro
+    depends_on:
+      - pgsql
+    ports:
+      - 5556:80
+      - 5557:443
+    expose:
+      - 80
+      - 443
+    restart: always
+
+  pgsql:
+    image: postgres:11.6
+    ports:
+      - 5555:5432
+    environment:
+      TZ: America/Argentina/Buenos_Aires
+      POSTGRES_PASSWORD: fcytadmin01
+      POSTGRES_DB: ddjj
+      PGDATA: /var/lib/postgresql/data/pgdata
+      #volumes:
+      #- ./pgsql:/var/lib/postgresql/data
+      #  - /etc/localtime:/etc/localtime:ro
+      #  - /etc/timezone:/etc/timezone:ro
+    restart: always
diff --git a/docker/000-default.conf b/docker/000-default.conf
new file mode 100644
index 0000000..e6e3735
--- /dev/null
+++ b/docker/000-default.conf
@@ -0,0 +1,32 @@
+ 
+<VirtualHost *:80>
+	# The ServerName directive sets the request scheme, hostname and port that
+	# the server uses to identify itself. This is used when creating
+	# redirection URLs. In the context of virtual hosts, the ServerName
+	# specifies what hostname must appear in the request's Host: header to
+	# match this virtual host. For the default virtual host (this file) this
+	# value is not decisive as it is used as a last resort host regardless.
+	# However, you must set it for any further virtual host explicitly.
+	#ServerName www.example.com
+
+	ServerAdmin webmaster@localhost
+	DocumentRoot /var/www/ddjj/public/
+
+	# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
+	# error, crit, alert, emerg.
+	# It is also possible to configure the loglevel for particular
+	# modules, e.g.
+	#LogLevel info ssl:warn
+
+	ErrorLog ${APACHE_LOG_DIR}/error.log
+	CustomLog ${APACHE_LOG_DIR}/access.log combined
+
+	# For most configuration files from conf-available/, which are
+	# enabled or disabled at a global level, it is possible to
+	# include a line for only one particular virtual host. For example the
+	# following line enables the CGI configuration for this host only
+	# after it has been globally disabled with "a2disconf".
+	#Include conf-available/serve-cgi-bin.conf
+</VirtualHost>
+
+# vim: syntax=apache ts=4 sw=4 sts=4 sr noet