Skip to content

Commit

Permalink
Updated translations, updated main Dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
craigk5n committed Nov 27, 2023
1 parent d5347e8 commit 34f5f6c
Show file tree
Hide file tree
Showing 70 changed files with 27,902 additions and 33,422 deletions.
10 changes: 8 additions & 2 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
.git
.gitignore
.github
bump_version.sh
docker

composer.json
composer.lock
# ignore all docs/
docs
# except these 2
!docs/newwin.gif
!docs/WebCalendar-SysAdmin.html

includes/settings.php
java
Makefile
Expand All @@ -18,3 +19,8 @@ tests
TODO
vendor
ws
wc-icons
terraform
.pytest_cache
*.old
.dockerignore
36 changes: 4 additions & 32 deletions docker/Dockerfile-php8
Original file line number Diff line number Diff line change
Expand Up @@ -8,38 +8,10 @@ LABEL vendor "k5n.us"

RUN docker-php-ext-install mysqli

# Copy only the files included in a release rather than all files.
RUN mkdir -p /var/www/html/images `
/var/www/html/includes `
/var/www/html/install `
/var/www/html/pub `
/var/www/html/themes `
/var/www/html/tools `
/var/www/html/translations `
# Don't we need these, too?
/var/www/html/docs `
/var/www/html/wc-icons

COPY includes /var/www/html/includes/

# In case there was a copy in the local dev setup,
# remove any existing settings.php.
RUN rm -f /var/www/html/includes/settings.php
# WARNING: May be a security issue!
# Better to use .dockerignore and never copy settings.php in at all.
# Copy all files except those in .dockerignore
COPY . /var/www/html/

# Create an empty settings.php file with write permissions for anyone
# to allow the web-based installer to update it.
RUN touch /var/www/html/includes/settings.php
RUN chmod 777 /var/www/html/includes/settings.php

COPY [a-z]*php favicon.ico GPL.html /var/www/html/
# Need AUTHORS, too, or about.php won't work.
COPY AUTHORS /var/www/html/

COPY docs /var/www/html/docs/
COPY images /var/www/html/images/
COPY install /var/www/html/install/
COPY pub /var/www/html/pub/
COPY themes /var/www/html/themes/
COPY tools /var/www/html/tools/
COPY translations /var/www/html/translations/
COPY wc-icons /var/www/html/wc-icons/
17 changes: 3 additions & 14 deletions release-files
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,9 @@ month.php
nulogin.php
pref.php
pub/bootstrap.bundle.min.js
pub/bootstrap.bundle.min.js.sha
pub/bootstrap.min.css
pub/bootstrap.min.css.sha
pub/ckeditor/bender-runner.config.json
pub/ckeditor/CHANGES.md
pub/ckeditor/ckeditor.js
Expand Down Expand Up @@ -341,6 +343,7 @@ pub/ckeditor/skins/moono-lisa/images/spinner.gif
pub/ckeditor/skins/moono-lisa/readme.md
pub/ckeditor/styles.js
pub/jquery.min.js
pub/jquery.min.js.sha
publish.php
purge.php
README.md
Expand All @@ -358,29 +361,15 @@ security_audit.php
SECURITY.md
select_user.php
set_entry_cat.php
themes/autumn_pref.gif
themes/autumn_pref.php
themes/basic_admin.gif
themes/basic_admin.php
themes/default_admin.php
themes/default_pref.gif
themes/default_pref.php
themes/spring_pref.gif
themes/spring_pref.php
themes/theme_inc.php
themes/touch_of_grey_pref.gif
themes/touch_of_grey_pref.php
tools/check_translation.pl
tools/convert_passwords.php
tools/palm_datebook.pl
tools/populate_sqlite3.php
tools/reload_remotes.php
tools/send_reminders.php
tools/summary.txt
tools/translation_summary.pl
tools/update_all.pl
tools/update_translation.pl
tools/upgrade_to_0.9.7.pl
translations/Afrikaans.txt
translations/Albanian.txt
translations/Arabic_utf8.txt
Expand Down
Binary file removed themes/autumn_pref.gif
Binary file not shown.
34 changes: 0 additions & 34 deletions themes/autumn_pref.php

This file was deleted.

Binary file removed themes/basic_admin.gif
Binary file not shown.
23 changes: 0 additions & 23 deletions themes/basic_admin.php

This file was deleted.

140 changes: 0 additions & 140 deletions themes/default_admin.php

This file was deleted.

Binary file removed themes/default_pref.gif
Binary file not shown.
40 changes: 0 additions & 40 deletions themes/default_pref.php

This file was deleted.

Binary file removed themes/spring_pref.gif
Binary file not shown.
34 changes: 0 additions & 34 deletions themes/spring_pref.php

This file was deleted.

Loading

0 comments on commit 34f5f6c

Please sign in to comment.