@wocker/ws 1.0.24 → 1.0.25
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/{RootModule.d.ts → AppModule.d.ts} +1 -1
- package/lib/{RootModule.js → AppModule.js} +9 -22
- package/lib/controllers/ProjectController.d.ts +0 -1
- package/lib/controllers/ProjectController.js +0 -16
- package/lib/env.d.ts +1 -1
- package/lib/env.js +3 -3
- package/lib/main.js +2 -2
- package/lib/modules/core/index.d.ts +2 -0
- package/lib/modules/{app → core}/index.js +19 -6
- package/lib/modules/docker/index.d.ts +2 -1
- package/lib/modules/docker/index.js +5 -1
- package/lib/modules/docker/services/ComposeService.d.ts +32 -0
- package/lib/modules/docker/services/ComposeService.js +129 -0
- package/lib/modules/docker/services/DockerService.js +2 -24
- package/lib/modules/docker/services/ImageService.d.ts +2 -8
- package/lib/modules/docker/services/ImageService.js +15 -3
- package/lib/modules/docker/services/ModemService.d.ts +3 -2
- package/lib/modules/docker/services/ModemService.js +24 -5
- package/lib/modules/docker/services/ProtoService.js +2 -2
- package/lib/modules/docker/type/ComposeConfig.d.ts +12 -0
- package/lib/modules/docker/type/ComposeConfig.js +2 -0
- package/lib/modules/index.d.ts +1 -1
- package/lib/modules/index.js +1 -1
- package/lib/modules/keystore/services/KeystoreService.d.ts +2 -3
- package/lib/modules/keystore/services/KeystoreService.js +2 -4
- package/lib/modules/preset/controllers/PresetController.js +2 -1
- package/lib/modules/preset/controllers/PresetListener.d.ts +3 -2
- package/lib/modules/preset/controllers/PresetListener.js +6 -3
- package/lib/modules/preset/services/PresetService.js +11 -2
- package/lib/modules/project/controllers/ProjectController.d.ts +1 -0
- package/lib/modules/project/controllers/ProjectController.js +16 -0
- package/lib/modules/project/services/ProjectService.d.ts +8 -4
- package/lib/modules/project/services/ProjectService.js +50 -8
- package/lib/modules/proxy/services/ProxyService.js +4 -3
- package/lib/utils/index.d.ts +0 -1
- package/lib/utils/index.js +0 -1
- package/package.json +4 -3
- package/lib/modules/app/index.d.ts +0 -2
- package/lib/utils/followProgress2.d.ts +0 -1
- package/lib/utils/followProgress2.js +0 -63
- package/plugins/proxmox/Dockerfile +0 -35
- package/plugins/proxy/Dockerfile +0 -25
- package/plugins/proxy/Procfile +0 -2
- package/plugins/proxy/bin/wocker-create-ca +0 -19
- package/plugins/proxy/bin/wocker-create-cert +0 -38
- package/plugins/proxy/bin/wocker-create-domains +0 -21
- package/presets/shopify/Dockerfile +0 -160
- package/presets/shopify/bin/compare-version +0 -3
- package/presets/shopify/config.json +0 -26
- package/presets/shopify/etc/apache2/apache2.conf +0 -230
- package/presets/shopify/etc/apache2/mods-available/mpm_prefork.conf +0 -16
- package/presets/shopify/etc/apache2/sites-available/000-default.conf +0 -21
- package/proto/buildkit.proto +0 -55
- package/proto/solver/pb/ops.proto +0 -443
|
@@ -1,160 +0,0 @@
|
|
|
1
|
-
ARG PHP_VERSION
|
|
2
|
-
|
|
3
|
-
FROM php:${PHP_VERSION}-apache
|
|
4
|
-
|
|
5
|
-
ARG UID=1000
|
|
6
|
-
ARG USER=user
|
|
7
|
-
|
|
8
|
-
RUN useradd -G www-data,root -u $UID -d /home/$USER $USER && \
|
|
9
|
-
mkdir -p /home/$USER && \
|
|
10
|
-
touch /home/$USER/.bashrc && \
|
|
11
|
-
chown -R $USER:$USER /home/$USER
|
|
12
|
-
|
|
13
|
-
# WS Tools
|
|
14
|
-
ADD ./bin/compare-version /usr/local/bin/compare-version
|
|
15
|
-
RUN chmod +x /usr/local/bin/compare-version
|
|
16
|
-
|
|
17
|
-
RUN apt-get clean
|
|
18
|
-
RUN apt-get update
|
|
19
|
-
|
|
20
|
-
RUN apt-get install -y --no-install-recommends \
|
|
21
|
-
git \
|
|
22
|
-
curl \
|
|
23
|
-
autoconf \
|
|
24
|
-
build-essential \
|
|
25
|
-
apt-utils \
|
|
26
|
-
zlib1g-dev \
|
|
27
|
-
libzip-dev \
|
|
28
|
-
unzip \
|
|
29
|
-
zip \
|
|
30
|
-
libmagick++-dev \
|
|
31
|
-
libmagickwand-dev \
|
|
32
|
-
libpq-dev \
|
|
33
|
-
libfreetype6-dev \
|
|
34
|
-
libjpeg62-turbo-dev \
|
|
35
|
-
libpng-dev \
|
|
36
|
-
libwebp-dev \
|
|
37
|
-
libxpm-dev \
|
|
38
|
-
libxml2-dev
|
|
39
|
-
|
|
40
|
-
RUN compare-version $PHP_VERSION "7.3" && \
|
|
41
|
-
docker-php-ext-configure zip || \
|
|
42
|
-
docker-php-ext-configure zip --with-libzip
|
|
43
|
-
|
|
44
|
-
RUN docker-php-ext-install -j "$(nproc)" zip
|
|
45
|
-
RUN docker-php-ext-install -j "$(nproc)" mysqli
|
|
46
|
-
RUN docker-php-ext-install pdo_mysql exif pcntl bcmath gd
|
|
47
|
-
RUN docker-php-ext-install soap
|
|
48
|
-
|
|
49
|
-
RUN a2enmod rewrite
|
|
50
|
-
RUN a2enmod headers
|
|
51
|
-
|
|
52
|
-
ADD ./etc/apache2/sites-available/000-default.conf /etc/apache2/sites-available/000-default.conf
|
|
53
|
-
ADD ./etc/apache2/apache2.conf /etc/apache2/apache2.conf
|
|
54
|
-
COPY ./etc/apache2/mods-available/mpm_prefork.conf /etc/apache2/mods-available/
|
|
55
|
-
|
|
56
|
-
RUN mkdir -p /home/$USER/.composer && \
|
|
57
|
-
chown -R $USER:$USER /home/$USER
|
|
58
|
-
|
|
59
|
-
RUN touch /home/$USER/.bashrc && chmod +x /home/$USER/.bashrc
|
|
60
|
-
RUN touch /home/$USER/.npmrc && chmod +x /home/$USER/.npmrc
|
|
61
|
-
|
|
62
|
-
# Composer
|
|
63
|
-
ARG COMPOSER_ENABLE=true
|
|
64
|
-
|
|
65
|
-
SHELL ["/bin/bash", "-c"]
|
|
66
|
-
RUN if [ "$COMPOSER_ENABLE" = "true" ]; then \
|
|
67
|
-
apt-get update && \
|
|
68
|
-
apt-get install -y bash-completion; \
|
|
69
|
-
echo "source /etc/bash_completion" >> /home/$USER/.bashrc; \
|
|
70
|
-
mkdir -p /home/$USER/.composer; \
|
|
71
|
-
curl -sL https://getcomposer.org/installer | php && \
|
|
72
|
-
mv composer.phar /usr/local/bin/composer && \
|
|
73
|
-
chmod +x /usr/local/bin/composer; \
|
|
74
|
-
echo ". <(composer completion bash)" >> /home/$USER/.bashrc; \
|
|
75
|
-
fi
|
|
76
|
-
SHELL ["/bin/sh", "-c"]
|
|
77
|
-
|
|
78
|
-
RUN chown -R $USER:$USER /home/$USER
|
|
79
|
-
|
|
80
|
-
USER $USER
|
|
81
|
-
|
|
82
|
-
# Install NodeJS
|
|
83
|
-
ARG NODE_VERSION=16.13.0
|
|
84
|
-
ENV NVM_DIR=/home/$USER/.nvm
|
|
85
|
-
|
|
86
|
-
RUN if [ "$NODE_VERSION" != "" ]; then \
|
|
87
|
-
mkdir -p $NVM_DIR; \
|
|
88
|
-
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash; \
|
|
89
|
-
. "$NVM_DIR/nvm.sh" && \
|
|
90
|
-
nvm install $NODE_VERSION && \
|
|
91
|
-
nvm alias default $NODE_VERSION && \
|
|
92
|
-
nvm use default; \
|
|
93
|
-
echo "[ -n \"\$(command -v npm)\" ] && . <(npm completion)" >> /home/$USER/.bashrc; \
|
|
94
|
-
fi
|
|
95
|
-
|
|
96
|
-
# Install ruby
|
|
97
|
-
USER root
|
|
98
|
-
RUN apt-get install -y \
|
|
99
|
-
gawk \
|
|
100
|
-
bison \
|
|
101
|
-
libssl-dev \
|
|
102
|
-
libgdbm-dev \
|
|
103
|
-
libncurses5-dev \
|
|
104
|
-
libsqlite3-dev \
|
|
105
|
-
libtool \
|
|
106
|
-
libyaml-dev \
|
|
107
|
-
sqlite3 \
|
|
108
|
-
libgmp-dev \
|
|
109
|
-
libreadline-dev \
|
|
110
|
-
libcurl4-openssl-dev \
|
|
111
|
-
software-properties-common \
|
|
112
|
-
libffi-dev \
|
|
113
|
-
libxslt1-dev \
|
|
114
|
-
ruby-full
|
|
115
|
-
|
|
116
|
-
RUN apt-get install -y gnupg2
|
|
117
|
-
|
|
118
|
-
RUN gem install bundler
|
|
119
|
-
|
|
120
|
-
USER $USER
|
|
121
|
-
|
|
122
|
-
#ENV RUBY_VERSION=2.7.5
|
|
123
|
-
#ENV RVM_DIR=/home/$USER/.rvm
|
|
124
|
-
#RUN mkdir -p $RVM_DIR
|
|
125
|
-
#
|
|
126
|
-
#RUN gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB && \
|
|
127
|
-
# command curl -sSL https://rvm.io/mpapis.asc | gpg --import - && \
|
|
128
|
-
# command curl -sSL https://rvm.io/pkuczynski.asc | gpg --import - && \
|
|
129
|
-
# curl -sSL https://get.rvm.io | bash -s stable --path $RVM_DIR
|
|
130
|
-
#
|
|
131
|
-
#SHELL ["/bin/bash", "-c"]
|
|
132
|
-
#RUN . "$RVM_DIR/scripts/rvm" && \
|
|
133
|
-
# rvm autolibs fail && \
|
|
134
|
-
# rvm install $RUBY_VERSION && \
|
|
135
|
-
# gem install bundler
|
|
136
|
-
#SHELL ["/bin/sh", "-c"]
|
|
137
|
-
#
|
|
138
|
-
#RUN echo "[ -s \"$RVM_DIR/scripts/rvm\" ] && \. \"$RVM_DIR/scripts/rvm\"" >> /home/$USER/.bashrc
|
|
139
|
-
|
|
140
|
-
USER root
|
|
141
|
-
|
|
142
|
-
RUN touch /usr/local/etc/php/conf.d/mail.ini && \
|
|
143
|
-
echo "SMTP = maildev.workspace" >> /usr/local/etc/php/conf.d/mail.ini && \
|
|
144
|
-
echo "smtp_port = 25" >> /usr/local/etc/php/conf.d/mail.ini
|
|
145
|
-
|
|
146
|
-
RUN touch /usr/local/etc/php/conf.d/uploads.ini && \
|
|
147
|
-
echo "upload_max_filesize = 100M;" >> /usr/local/etc/php/conf.d/uploads.ini && \
|
|
148
|
-
echo "post_max_size = 100M;" >> /usr/local/etc/php/conf.d/uploads.ini
|
|
149
|
-
|
|
150
|
-
RUN touch /usr/local/etc/php/conf.d/memory.ini && \
|
|
151
|
-
echo "memory_limit = 256M;" >> /usr/local/etc/php/conf.d/memory.ini
|
|
152
|
-
|
|
153
|
-
USER $USER
|
|
154
|
-
|
|
155
|
-
ENV APACHE_DOCUMENT_ROOT /var/www
|
|
156
|
-
WORKDIR $APACHE_DOCUMENT_ROOT
|
|
157
|
-
|
|
158
|
-
EXPOSE 80
|
|
159
|
-
EXPOSE 443
|
|
160
|
-
|
|
@@ -1,26 +0,0 @@
|
|
|
1
|
-
{
|
|
2
|
-
"name": "shopify",
|
|
3
|
-
"version": "1.0.0",
|
|
4
|
-
"dockerfile": "./Dockerfile",
|
|
5
|
-
"buildArgsOptions": {
|
|
6
|
-
"PHP_VERSION": {
|
|
7
|
-
"message": "PHP version",
|
|
8
|
-
"type": "select",
|
|
9
|
-
"hash": false,
|
|
10
|
-
"options": [
|
|
11
|
-
"7.4",
|
|
12
|
-
"8.2"
|
|
13
|
-
]
|
|
14
|
-
}
|
|
15
|
-
},
|
|
16
|
-
"envOptions": {
|
|
17
|
-
"APACHE_DOCUMENT_ROOT": {
|
|
18
|
-
"type": "string",
|
|
19
|
-
"message": "Apache document root",
|
|
20
|
-
"default": "/var/www"
|
|
21
|
-
}
|
|
22
|
-
},
|
|
23
|
-
"volumeOptions": [
|
|
24
|
-
"./:/var/www"
|
|
25
|
-
]
|
|
26
|
-
}
|
|
@@ -1,230 +0,0 @@
|
|
|
1
|
-
# This is the main Apache server configuration file. It contains the
|
|
2
|
-
# configuration directives that give the server its instructions.
|
|
3
|
-
# See http://httpd.apache.org/docs/2.4/ for detailed information about
|
|
4
|
-
# the directives and /usr/share/doc/apache2/README.Debian about Debian specific
|
|
5
|
-
# hints.
|
|
6
|
-
#
|
|
7
|
-
#
|
|
8
|
-
# Summary of how the Apache 2 configuration works in Debian:
|
|
9
|
-
# The Apache 2 web server configuration in Debian is quite different to
|
|
10
|
-
# upstream's suggested way to configure the web server. This is because Debian's
|
|
11
|
-
# default Apache2 installation attempts to make adding and removing modules,
|
|
12
|
-
# virtual hosts, and extra configuration directives as flexible as possible, in
|
|
13
|
-
# order to make automating the changes and administering the server as easy as
|
|
14
|
-
# possible.
|
|
15
|
-
|
|
16
|
-
# It is split into several files forming the configuration hierarchy outlined
|
|
17
|
-
# below, all located in the /etc/apache2/ directory:
|
|
18
|
-
#
|
|
19
|
-
# /etc/apache2/
|
|
20
|
-
# |-- apache2.conf
|
|
21
|
-
# | `-- ports.conf
|
|
22
|
-
# |-- mods-enabled
|
|
23
|
-
# | |-- *.load
|
|
24
|
-
# | `-- *.conf
|
|
25
|
-
# |-- conf-enabled
|
|
26
|
-
# | `-- *.conf
|
|
27
|
-
# `-- sites-enabled
|
|
28
|
-
# `-- *.conf
|
|
29
|
-
#
|
|
30
|
-
#
|
|
31
|
-
# * apache2.conf is the main configuration file (this file). It puts the pieces
|
|
32
|
-
# together by including all remaining configuration files when starting up the
|
|
33
|
-
# web server.
|
|
34
|
-
#
|
|
35
|
-
# * ports.conf is always included from the main configuration file. It is
|
|
36
|
-
# supposed to determine listening ports for incoming connections which can be
|
|
37
|
-
# customized anytime.
|
|
38
|
-
#
|
|
39
|
-
# * Configuration files in the mods-enabled/, conf-enabled/ and sites-enabled/
|
|
40
|
-
# directories contain particular configuration snippets which manage modules,
|
|
41
|
-
# global configuration fragments, or virtual host configurations,
|
|
42
|
-
# respectively.
|
|
43
|
-
#
|
|
44
|
-
# They are activated by symlinking available configuration files from their
|
|
45
|
-
# respective *-available/ counterparts. These should be managed by using our
|
|
46
|
-
# helpers a2enmod/a2dismod, a2ensite/a2dissite and a2enconf/a2disconf. See
|
|
47
|
-
# their respective man pages for detailed information.
|
|
48
|
-
#
|
|
49
|
-
# * The binary is called apache2. Due to the use of environment variables, in
|
|
50
|
-
# the default configuration, apache2 needs to be started/stopped with
|
|
51
|
-
# /etc/init.d/apache2 or apache2ctl. Calling /usr/bin/apache2 directly will not
|
|
52
|
-
# work with the default configuration.
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
# Global configuration
|
|
56
|
-
#
|
|
57
|
-
|
|
58
|
-
#
|
|
59
|
-
# ServerRoot: The top of the directory tree under which the server's
|
|
60
|
-
# configuration, error, and log files are kept.
|
|
61
|
-
#
|
|
62
|
-
# NOTE! If you intend to place this on an NFS (or otherwise network)
|
|
63
|
-
# mounted filesystem then please read the Mutex documentation (available
|
|
64
|
-
# at <URL:http://httpd.apache.org/docs/2.4/mod/core.html#mutex>);
|
|
65
|
-
# you will save yourself a lot of trouble.
|
|
66
|
-
#
|
|
67
|
-
# Do NOT add a slash at the end of the directory path.
|
|
68
|
-
#
|
|
69
|
-
#ServerRoot "/etc/apache2"
|
|
70
|
-
|
|
71
|
-
#
|
|
72
|
-
# The accept serialization lock file MUST BE STORED ON A LOCAL DISK.
|
|
73
|
-
#
|
|
74
|
-
#Mutex file:${APACHE_LOCK_DIR} default
|
|
75
|
-
|
|
76
|
-
#
|
|
77
|
-
# The directory where shm and other runtime files will be stored.
|
|
78
|
-
#
|
|
79
|
-
|
|
80
|
-
DefaultRuntimeDir ${APACHE_RUN_DIR}
|
|
81
|
-
|
|
82
|
-
#
|
|
83
|
-
# PidFile: The file in which the server should record its process
|
|
84
|
-
# identification number when it starts.
|
|
85
|
-
# This needs to be set in /etc/apache2/envvars
|
|
86
|
-
#
|
|
87
|
-
PidFile ${APACHE_PID_FILE}
|
|
88
|
-
|
|
89
|
-
#
|
|
90
|
-
# Timeout: The number of seconds before receives and sends time out.
|
|
91
|
-
#
|
|
92
|
-
Timeout 300
|
|
93
|
-
|
|
94
|
-
#
|
|
95
|
-
# KeepAlive: Whether or not to allow persistent connections (more than
|
|
96
|
-
# one request per connection). Set to "Off" to deactivate.
|
|
97
|
-
#
|
|
98
|
-
KeepAlive On
|
|
99
|
-
|
|
100
|
-
#
|
|
101
|
-
# MaxKeepAliveRequests: The maximum number of requests to allow
|
|
102
|
-
# during a persistent connection. Set to 0 to allow an unlimited amount.
|
|
103
|
-
# We recommend you leave this number high, for maximum performance.
|
|
104
|
-
#
|
|
105
|
-
MaxKeepAliveRequests 100
|
|
106
|
-
|
|
107
|
-
#
|
|
108
|
-
# KeepAliveTimeout: Number of seconds to wait for the next request from the
|
|
109
|
-
# same client on the same connection.
|
|
110
|
-
#
|
|
111
|
-
KeepAliveTimeout 5
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
# These need to be set in /etc/apache2/envvars
|
|
115
|
-
User ${APACHE_RUN_USER}
|
|
116
|
-
Group ${APACHE_RUN_GROUP}
|
|
117
|
-
|
|
118
|
-
#
|
|
119
|
-
# HostnameLookups: Log the names of clients or just their IP addresses
|
|
120
|
-
# e.g., www.apache.org (on) or 204.62.129.132 (off).
|
|
121
|
-
# The default is off because it'd be overall better for the net if people
|
|
122
|
-
# had to knowingly turn this feature on, since enabling it means that
|
|
123
|
-
# each client request will result in AT LEAST one lookup request to the
|
|
124
|
-
# nameserver.
|
|
125
|
-
#
|
|
126
|
-
HostnameLookups Off
|
|
127
|
-
|
|
128
|
-
# ErrorLog: The location of the error log file.
|
|
129
|
-
# If you do not specify an ErrorLog directive within a <VirtualHost>
|
|
130
|
-
# container, error messages relating to that virtual host will be
|
|
131
|
-
# logged here. If you *do* define an error logfile for a <VirtualHost>
|
|
132
|
-
# container, that host's errors will be logged there and not here.
|
|
133
|
-
#
|
|
134
|
-
ErrorLog ${APACHE_LOG_DIR}/error.log
|
|
135
|
-
|
|
136
|
-
#
|
|
137
|
-
# LogLevel: Control the severity of messages logged to the error_log.
|
|
138
|
-
# Available values: trace8, ..., trace1, debug, info, notice, warn,
|
|
139
|
-
# error, crit, alert, emerg.
|
|
140
|
-
# It is also possible to configure the log level for particular modules, e.g.
|
|
141
|
-
# "LogLevel info ssl:warn"
|
|
142
|
-
#
|
|
143
|
-
LogLevel warn
|
|
144
|
-
|
|
145
|
-
# Include module configuration:
|
|
146
|
-
IncludeOptional mods-enabled/*.load
|
|
147
|
-
IncludeOptional mods-enabled/*.conf
|
|
148
|
-
|
|
149
|
-
# Include list of ports to listen on
|
|
150
|
-
Include ports.conf
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
# Sets the default security model of the Apache2 HTTPD server. It does
|
|
154
|
-
# not allow access to the root filesystem outside of /usr/share and /var/www.
|
|
155
|
-
# The former is used by web applications packaged in Debian,
|
|
156
|
-
# the latter may be used for local directories served by the web server. If
|
|
157
|
-
# your system is serving content from a sub-directory in /srv you must allow
|
|
158
|
-
# access here, or in any related virtual host.
|
|
159
|
-
<Directory />
|
|
160
|
-
Options FollowSymLinks
|
|
161
|
-
AllowOverride None
|
|
162
|
-
Require all denied
|
|
163
|
-
</Directory>
|
|
164
|
-
|
|
165
|
-
<Directory /usr/share>
|
|
166
|
-
AllowOverride None
|
|
167
|
-
Require all granted
|
|
168
|
-
</Directory>
|
|
169
|
-
|
|
170
|
-
<Directory /var/www/>
|
|
171
|
-
Options Indexes FollowSymLinks
|
|
172
|
-
AllowOverride None
|
|
173
|
-
Require all granted
|
|
174
|
-
</Directory>
|
|
175
|
-
|
|
176
|
-
#<Directory /srv/>
|
|
177
|
-
# Options Indexes FollowSymLinks
|
|
178
|
-
# AllowOverride None
|
|
179
|
-
# Require all granted
|
|
180
|
-
#</Directory>
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
# AccessFileName: The name of the file to look for in each directory
|
|
186
|
-
# for additional configuration directives. See also the AllowOverride
|
|
187
|
-
# directive.
|
|
188
|
-
#
|
|
189
|
-
AccessFileName .htaccess
|
|
190
|
-
|
|
191
|
-
#
|
|
192
|
-
# The following lines prevent .htaccess and .htpasswd files from being
|
|
193
|
-
# viewed by Web clients.
|
|
194
|
-
#
|
|
195
|
-
<FilesMatch "^\.ht">
|
|
196
|
-
Require all denied
|
|
197
|
-
</FilesMatch>
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
#
|
|
201
|
-
# The following directives define some format nicknames for use with
|
|
202
|
-
# a CustomLog directive.
|
|
203
|
-
#
|
|
204
|
-
# These deviate from the Common Log Format definitions in that they use %O
|
|
205
|
-
# (the actual bytes sent including headers) instead of %b (the size of the
|
|
206
|
-
# requested file), because the latter makes it impossible to detect partial
|
|
207
|
-
# requests.
|
|
208
|
-
#
|
|
209
|
-
# Note that the use of %{X-Forwarded-For}i instead of %h is not recommended.
|
|
210
|
-
# Use mod_remoteip instead.
|
|
211
|
-
#
|
|
212
|
-
LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined
|
|
213
|
-
LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined
|
|
214
|
-
LogFormat "%h %l %u %t \"%r\" %>s %O" common
|
|
215
|
-
LogFormat "%{Referer}i -> %U" referer
|
|
216
|
-
LogFormat "%{User-agent}i" agent
|
|
217
|
-
|
|
218
|
-
# Include of directories ignores editors' and dpkg's backup files,
|
|
219
|
-
# see README.Debian for details.
|
|
220
|
-
|
|
221
|
-
# Include generic snippets of statements
|
|
222
|
-
IncludeOptional conf-enabled/*.conf
|
|
223
|
-
|
|
224
|
-
# Include the virtual host configurations:
|
|
225
|
-
IncludeOptional sites-enabled/*.conf
|
|
226
|
-
|
|
227
|
-
# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
|
|
228
|
-
|
|
229
|
-
ServerTokens Prod
|
|
230
|
-
ServerSignature Off
|
|
@@ -1,16 +0,0 @@
|
|
|
1
|
-
# prefork MPM
|
|
2
|
-
# StartServers: number of server processes to start
|
|
3
|
-
# MinSpareServers: minimum number of server processes which are kept spare
|
|
4
|
-
# MaxSpareServers: maximum number of server processes which are kept spare
|
|
5
|
-
# MaxRequestWorkers: maximum number of server processes allowed to start
|
|
6
|
-
# MaxConnectionsPerChild: maximum number of requests a server process serves
|
|
7
|
-
|
|
8
|
-
<IfModule mpm_prefork_module>
|
|
9
|
-
StartServers 5
|
|
10
|
-
MinSpareServers 10
|
|
11
|
-
MaxSpareServers 20
|
|
12
|
-
MaxRequestWorkers 150
|
|
13
|
-
MaxConnectionsPerChild 0
|
|
14
|
-
</IfModule>
|
|
15
|
-
|
|
16
|
-
# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
|
|
@@ -1,21 +0,0 @@
|
|
|
1
|
-
<VirtualHost *:80>
|
|
2
|
-
# ServerName localhost
|
|
3
|
-
# ServerAlias preset-front.workspace
|
|
4
|
-
|
|
5
|
-
DocumentRoot ${APACHE_DOCUMENT_ROOT}
|
|
6
|
-
# SetEnv PHP_ENV live
|
|
7
|
-
|
|
8
|
-
# <Directory /var/www>
|
|
9
|
-
# Options +ExecCGI -Indexes +FollowSymLinks +MultiViews
|
|
10
|
-
# AllowOverride All
|
|
11
|
-
# Require all granted
|
|
12
|
-
# </Directory>
|
|
13
|
-
|
|
14
|
-
<FilesMatch "\.(env|yml|sh|conf)|Dockerfile">
|
|
15
|
-
Order allow,deny
|
|
16
|
-
Deny from all
|
|
17
|
-
</FilesMatch>
|
|
18
|
-
|
|
19
|
-
ErrorLog /dev/stderr
|
|
20
|
-
CustomLog /dev/stdout combined
|
|
21
|
-
</VirtualHost>
|
package/proto/buildkit.proto
DELETED
|
@@ -1,55 +0,0 @@
|
|
|
1
|
-
syntax = "proto3";
|
|
2
|
-
|
|
3
|
-
import "google/protobuf/timestamp.proto";
|
|
4
|
-
|
|
5
|
-
package moby.buildkit.v1;
|
|
6
|
-
|
|
7
|
-
message StatusResponse {
|
|
8
|
-
repeated Vertex vertexes = 1;
|
|
9
|
-
repeated VertexStatus statuses = 2;
|
|
10
|
-
repeated VertexLog logs = 3;
|
|
11
|
-
repeated VertexWarning warnings = 4;
|
|
12
|
-
}
|
|
13
|
-
|
|
14
|
-
message Vertex {
|
|
15
|
-
string digest = 1;
|
|
16
|
-
repeated string inputs = 2;
|
|
17
|
-
string name = 3;
|
|
18
|
-
bool cached = 4;
|
|
19
|
-
|
|
20
|
-
google.protobuf.Timestamp started = 5;
|
|
21
|
-
google.protobuf.Timestamp completed = 6;
|
|
22
|
-
string error = 7; // typed errors?
|
|
23
|
-
ProgressGroup progressGroup = 8;
|
|
24
|
-
}
|
|
25
|
-
|
|
26
|
-
message VertexStatus {
|
|
27
|
-
string ID = 1;
|
|
28
|
-
string vertex = 2;
|
|
29
|
-
string name = 3;
|
|
30
|
-
int64 current = 4;
|
|
31
|
-
int64 total = 5;
|
|
32
|
-
}
|
|
33
|
-
|
|
34
|
-
message ProgressGroup {
|
|
35
|
-
string id = 1;
|
|
36
|
-
string name = 2;
|
|
37
|
-
bool weak = 3;
|
|
38
|
-
}
|
|
39
|
-
|
|
40
|
-
message VertexLog {
|
|
41
|
-
string vertex = 1;
|
|
42
|
-
google.protobuf.Timestamp timestamp = 2;
|
|
43
|
-
int64 stream = 3;
|
|
44
|
-
bytes msg = 4;
|
|
45
|
-
}
|
|
46
|
-
|
|
47
|
-
message VertexWarning {
|
|
48
|
-
string vertex = 1;
|
|
49
|
-
int64 level = 2;
|
|
50
|
-
bytes short = 3;
|
|
51
|
-
repeated bytes detail = 4;
|
|
52
|
-
string url = 5;
|
|
53
|
-
pb.SourceInfo info = 6;
|
|
54
|
-
repeated pb.Range ranges = 7;
|
|
55
|
-
}
|